summaryrefslogtreecommitdiffstats
path: root/edify
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2017-10-05 18:04:02 +0200
committerGerrit Code Review <noreply-gerritcodereview@google.com>2017-10-05 18:04:02 +0200
commit916e155bab5b0997c71243f1c8daae15093253d9 (patch)
tree633bee4e09a586c4e9e8a35cecdbc2e7c801e711 /edify
parentMerge "edify: Remove edify_parser." (diff)
parentMove error_code.h into otautil. (diff)
downloadandroid_bootable_recovery-916e155bab5b0997c71243f1c8daae15093253d9.tar
android_bootable_recovery-916e155bab5b0997c71243f1c8daae15093253d9.tar.gz
android_bootable_recovery-916e155bab5b0997c71243f1c8daae15093253d9.tar.bz2
android_bootable_recovery-916e155bab5b0997c71243f1c8daae15093253d9.tar.lz
android_bootable_recovery-916e155bab5b0997c71243f1c8daae15093253d9.tar.xz
android_bootable_recovery-916e155bab5b0997c71243f1c8daae15093253d9.tar.zst
android_bootable_recovery-916e155bab5b0997c71243f1c8daae15093253d9.zip
Diffstat (limited to 'edify')
-rw-r--r--edify/Android.mk5
-rw-r--r--edify/expr.h2
2 files changed, 4 insertions, 3 deletions
diff --git a/edify/Android.mk b/edify/Android.mk
index cec65f42a..db7b5b6b5 100644
--- a/edify/Android.mk
+++ b/edify/Android.mk
@@ -30,7 +30,8 @@ LOCAL_CFLAGS := -Wall -Werror
LOCAL_CPPFLAGS := -Wno-unused-parameter
LOCAL_CPPFLAGS += -Wno-deprecated-register
LOCAL_MODULE := libedify
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
-LOCAL_STATIC_LIBRARIES += libbase
+LOCAL_STATIC_LIBRARIES += \
+ libotautil \
+ libbase
include $(BUILD_STATIC_LIBRARY)
diff --git a/edify/expr.h b/edify/expr.h
index 4838d20c0..f2a4d6dcf 100644
--- a/edify/expr.h
+++ b/edify/expr.h
@@ -23,7 +23,7 @@
#include <string>
#include <vector>
-#include "error_code.h"
+#include "otautil/error_code.h"
struct State {
State(const std::string& script, void* cookie);