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 /updater/updater.cpp | |
| parent | 7a3fc2de8eb535637055a4a1c0063c5fbc101c4a (diff) | |
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 'updater/updater.cpp')
| -rw-r--r-- | updater/updater.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/updater/updater.cpp b/updater/updater.cpp index 309c309a..f55a0d3b 100644 --- a/updater/updater.cpp +++ b/updater/updater.cpp @@ -31,10 +31,10 @@ #include <ziparchive/zip_archive.h> #include "edify/expr.h" -#include "error_code.h" #include "otafault/config.h" #include "otautil/DirUtil.h" #include "otautil/SysUtil.h" +#include "otautil/error_code.h" #include "updater/blockimg.h" #include "updater/install.h" |