diff options
| author | Tao Bao <tbao@google.com> | 2017-10-05 19:18:04 +0200 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-10-05 19:18:04 +0200 |
| commit | b23d29642da8550beeaf39ea5d146d8b90d46f01 (patch) | |
| tree | 538f084ed5750d2dc0992deec0c3dc372cd53794 /edify | |
| parent | Merge "Move error_code.h into otautil." (diff) | |
| parent | Revert "Move error_code.h into otautil." (diff) | |
| download | android_bootable_recovery-b23d29642da8550beeaf39ea5d146d8b90d46f01.tar android_bootable_recovery-b23d29642da8550beeaf39ea5d146d8b90d46f01.tar.gz android_bootable_recovery-b23d29642da8550beeaf39ea5d146d8b90d46f01.tar.bz2 android_bootable_recovery-b23d29642da8550beeaf39ea5d146d8b90d46f01.tar.lz android_bootable_recovery-b23d29642da8550beeaf39ea5d146d8b90d46f01.tar.xz android_bootable_recovery-b23d29642da8550beeaf39ea5d146d8b90d46f01.tar.zst android_bootable_recovery-b23d29642da8550beeaf39ea5d146d8b90d46f01.zip | |
Diffstat (limited to '')
| -rw-r--r-- | edify/Android.mk | 5 | ||||
| -rw-r--r-- | edify/expr.h | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/edify/Android.mk b/edify/Android.mk index db7b5b6b5..cec65f42a 100644 --- a/edify/Android.mk +++ b/edify/Android.mk @@ -30,8 +30,7 @@ LOCAL_CFLAGS := -Wall -Werror LOCAL_CPPFLAGS := -Wno-unused-parameter LOCAL_CPPFLAGS += -Wno-deprecated-register LOCAL_MODULE := libedify -LOCAL_STATIC_LIBRARIES += \ - libotautil \ - libbase +LOCAL_C_INCLUDES += $(LOCAL_PATH)/.. +LOCAL_STATIC_LIBRARIES += libbase include $(BUILD_STATIC_LIBRARY) diff --git a/edify/expr.h b/edify/expr.h index f2a4d6dcf..4838d20c0 100644 --- a/edify/expr.h +++ b/edify/expr.h @@ -23,7 +23,7 @@ #include <string> #include <vector> -#include "otautil/error_code.h" +#include "error_code.h" struct State { State(const std::string& script, void* cookie); |