diff options
author | Tao Bao | 2017-10-06 09:43:41 -0500 |
---|---|---|
committer | Tao Bao | 2017-10-09 16:07:54 -0500 |
commit | 1fc5bf353a8719d16fd9ba29a661d211bad4038f (patch) | |
tree | 644083a8406ab70e674040e460942d878fca5ab5 /uncrypt/uncrypt.cpp | |
parent | 7a3fc2de8eb535637055a4a1c0063c5fbc101c4a (diff) | |
download | platform-bootable-recovery-1fc5bf353a8719d16fd9ba29a661d211bad4038f.tar.gz platform-bootable-recovery-1fc5bf353a8719d16fd9ba29a661d211bad4038f.tar.xz platform-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 @@ | |||
116 | #include <cutils/sockets.h> | 116 | #include <cutils/sockets.h> |
117 | #include <fs_mgr.h> | 117 | #include <fs_mgr.h> |
118 | 118 | ||
119 | #include "error_code.h" | 119 | #include "otautil/error_code.h" |
120 | 120 | ||
121 | static constexpr int WINDOW_SIZE = 5; | 121 | static constexpr int WINDOW_SIZE = 5; |
122 | static constexpr int FIBMAP_RETRY_LIMIT = 3; | 122 | static constexpr int FIBMAP_RETRY_LIMIT = 3; |