diff options
| author | Tao Bao <tbao@google.com> | 2017-10-06 07:43:41 -0700 |
|---|---|---|
| committer | Tao Bao <tbao@google.com> | 2017-10-09 14:07:54 -0700 |
| commit | 1fc5bf353a8719d16fd9ba29a661d211bad4038f (patch) | |
| tree | 644083a8406ab70e674040e460942d878fca5ab5 /uncrypt/uncrypt.cpp | |
| parent | 7a3fc2de8eb535637055a4a1c0063c5fbc101c4a (diff) | |
| download | android_bootable_recovery-1fc5bf353a8719d16fd9ba29a661d211bad4038f.tar.gz android_bootable_recovery-1fc5bf353a8719d16fd9ba29a661d211bad4038f.tar.bz2 android_bootable_recovery-1fc5bf353a8719d16fd9ba29a661d211bad4038f.zip | |
Revert "Revert "Move error_code.h into otautil.""
This reverts commit 26436d6d6010d5323349af7e119ff8f34f85c40c to re-land
"Move error_code.h into otautil.".
This way it stops requiring relative path ".." in LOCAL_C_INCLUDES
(uncrypt and edify). Soong doesn't accept non-local ".." in
"local_include_dirs".
This CL needs to land with device-specific module changes (e.g. adding
the dependency on libotautil).
Test: lunch aosp_{angler,bullhead,dragon,fugu,sailfish}-userdebug;
mmma bootable/recovery
Change-Id: If193241801af2dae73eccd31ce57cd2b81c9fd96
Diffstat (limited to 'uncrypt/uncrypt.cpp')
| -rw-r--r-- | uncrypt/uncrypt.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/uncrypt/uncrypt.cpp b/uncrypt/uncrypt.cpp index 7a2ccbc7..645faadb 100644 --- a/uncrypt/uncrypt.cpp +++ b/uncrypt/uncrypt.cpp @@ -116,7 +116,7 @@ #include <cutils/sockets.h> #include <fs_mgr.h> -#include "error_code.h" +#include "otautil/error_code.h" static constexpr int WINDOW_SIZE = 5; static constexpr int FIBMAP_RETRY_LIMIT = 3; |