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 /edify/expr.h
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 'edify/expr.h')
-rw-r--r--edify/expr.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/edify/expr.h b/edify/expr.h
index 32828028..770d1cf0 100644
--- a/edify/expr.h
+++ b/edify/expr.h
@@ -23,7 +23,7 @@
23#include <string> 23#include <string>
24#include <vector> 24#include <vector>
25 25
26// Forward declaration to avoid including "error_code.h". 26// Forward declaration to avoid including "otautil/error_code.h".
27enum ErrorCode : int; 27enum ErrorCode : int;
28enum CauseCode : int; 28enum CauseCode : int;
29 29