diff options
| author | Tao Bao <tbao@google.com> | 2017-10-05 18:15:45 +0200 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-10-05 18:15:45 +0200 |
| commit | 12ffa8bfbfafd482e95ff95c9047950e1b0738b1 (patch) | |
| tree | 434c34b1cf37fe64f4a26f5820e22fad9823882b /edify | |
| parent | Merge "edify: Remove edify_parser." am: 281d4eefb1 am: dfbe70b79d am: 159db1dd49 (diff) | |
| parent | Merge "Move error_code.h into otautil." am: 916e155bab am: 73831e0636 (diff) | |
| download | android_bootable_recovery-12ffa8bfbfafd482e95ff95c9047950e1b0738b1.tar android_bootable_recovery-12ffa8bfbfafd482e95ff95c9047950e1b0738b1.tar.gz android_bootable_recovery-12ffa8bfbfafd482e95ff95c9047950e1b0738b1.tar.bz2 android_bootable_recovery-12ffa8bfbfafd482e95ff95c9047950e1b0738b1.tar.lz android_bootable_recovery-12ffa8bfbfafd482e95ff95c9047950e1b0738b1.tar.xz android_bootable_recovery-12ffa8bfbfafd482e95ff95c9047950e1b0738b1.tar.zst android_bootable_recovery-12ffa8bfbfafd482e95ff95c9047950e1b0738b1.zip | |
Diffstat (limited to 'edify')
| -rw-r--r-- | edify/Android.mk | 5 | ||||
| -rw-r--r-- | edify/expr.h | 2 |
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); |