aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Bao2017-10-06 09:43:41 -0500
committerTao Bao2017-10-09 16:07:54 -0500
commit1fc5bf353a8719d16fd9ba29a661d211bad4038f (patch)
tree644083a8406ab70e674040e460942d878fca5ab5 /install.cpp
parent7a3fc2de8eb535637055a4a1c0063c5fbc101c4a (diff)
downloadplatform-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 'install.cpp')
-rw-r--r--install.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/install.cpp b/install.cpp
index 74d1a68b..d0589317 100644
--- a/install.cpp
+++ b/install.cpp
@@ -49,9 +49,9 @@
49#include <ziparchive/zip_archive.h> 49#include <ziparchive/zip_archive.h>
50 50
51#include "common.h" 51#include "common.h"
52#include "error_code.h"
53#include "otautil/SysUtil.h" 52#include "otautil/SysUtil.h"
54#include "otautil/ThermalUtil.h" 53#include "otautil/ThermalUtil.h"
54#include "otautil/error_code.h"
55#include "private/install.h" 55#include "private/install.h"
56#include "roots.h" 56#include "roots.h"
57#include "ui.h" 57#include "ui.h"