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 /recovery.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 'recovery.cpp')
-rw-r--r--recovery.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/recovery.cpp b/recovery.cpp
index 4dc5b540..243ee4af 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -61,13 +61,13 @@
61#include "adb_install.h" 61#include "adb_install.h"
62#include "common.h" 62#include "common.h"
63#include "device.h" 63#include "device.h"
64#include "error_code.h"
65#include "fuse_sdcard_provider.h" 64#include "fuse_sdcard_provider.h"
66#include "fuse_sideload.h" 65#include "fuse_sideload.h"
67#include "install.h" 66#include "install.h"
68#include "minadbd/minadbd.h" 67#include "minadbd/minadbd.h"
69#include "minui/minui.h" 68#include "minui/minui.h"
70#include "otautil/DirUtil.h" 69#include "otautil/DirUtil.h"
70#include "otautil/error_code.h"
71#include "roots.h" 71#include "roots.h"
72#include "rotate_logs.h" 72#include "rotate_logs.h"
73#include "screen_ui.h" 73#include "screen_ui.h"