diff options
author | Tao Bao <tbao@google.com> | 2017-10-06 14:51:09 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-10-06 14:51:09 +0000 |
commit | d7a6b5c66a278407228546a467c5e02e3f124b80 (patch) | |
tree | 1f1894c3f0f3334adddf6a5581b416578f51765f | |
parent | df3be61e826347516b36ece768fd610b86cd8c63 (diff) | |
parent | 603635710d5547b5c1f211d1be8cbb0fc88a973e (diff) | |
download | dragon-d7a6b5c66a278407228546a467c5e02e3f124b80.tar.gz |
recovery: Add dependency on libedify. am: 7c62d00eee
am: 603635710d
Change-Id: I673b87057c062d16ecdae7c4101fbb41be8a2ac2
-rw-r--r-- | recovery/updater/Android.mk | 8 | ||||
-rw-r--r-- | recovery/updater/recovery_updater.cpp | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/recovery/updater/Android.mk b/recovery/updater/Android.mk index 965dd52..7dc1efb 100644 --- a/recovery/updater/Android.mk +++ b/recovery/updater/Android.mk @@ -13,10 +13,13 @@ LOCAL_SRC_FILES := \ vboot_interface.c \ recovery_updater.cpp \ update_fw.cpp +# For error_code.h (included by recovery_updater.cpp). LOCAL_C_INCLUDES += bootable/recovery # For vboot_struct.h LOCAL_C_INCLUDES += external/vboot_reference/firmware/include LOCAL_CFLAGS += -Werror +LOCAL_STATIC_LIBRARIES := \ + libedify include $(BUILD_STATIC_LIBRARY) @@ -30,10 +33,13 @@ LOCAL_SRC_FILES := \ flash_file.cpp \ vboot_interface.c \ recovery_ui.cpp +# For ui.h, common.h (included by recovery_ui.cpp). LOCAL_C_INCLUDES += bootable/recovery # For vboot_struct.h LOCAL_C_INCLUDES += external/vboot_reference/firmware/include LOCAL_CFLAGS += -Werror +LOCAL_STATIC_LIBRARIES := \ + libedify include $(BUILD_STATIC_LIBRARY) @@ -46,6 +52,8 @@ LOCAL_CFLAGS += -Wno-unused-parameter -DUSE_LOGCAT LOCAL_C_INCLUDES += bootable/recovery # For vboot_struct.h LOCAL_C_INCLUDES += external/vboot_reference/firmware/include +LOCAL_STATIC_LIBRARIES := \ + libedify include $(BUILD_EXECUTABLE) diff --git a/recovery/updater/recovery_updater.cpp b/recovery/updater/recovery_updater.cpp index 5da8989..b9b67f0 100644 --- a/recovery/updater/recovery_updater.cpp +++ b/recovery/updater/recovery_updater.cpp @@ -25,6 +25,7 @@ #include <vector> #include "edify/expr.h" +#include "error_code.h" #include "update_fw.h" Value* firmware_update(const char *name, State * state, |