summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2017-10-05 12:44:10 -0700
committerTao Bao <tbao@google.com>2017-10-05 12:47:16 -0700
commit7c62d00eee2dbb8ffd24653d1adc363d131585fb (patch)
tree1e5e8b684ca0c3f727fe13930963e96b31f7b67c
parent8a0490365df0ab52123e7e2ff99426b39c1df151 (diff)
downloaddragon-7c62d00eee2dbb8ffd24653d1adc363d131585fb.tar.gz
recovery: Add dependency on libedify.
Also #include "error_code.h" in recovery_updater.cpp. Test: mmma bootable/recovery device/google/dragon/recovery Change-Id: If6dbdb8a516c3f583306784c485e0b71199a582e
-rw-r--r--recovery/updater/Android.mk8
-rw-r--r--recovery/updater/recovery_updater.cpp1
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,