summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2017-10-06 14:56:21 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-10-06 14:56:21 +0000
commit6c94033f42cc05ecf9036d9f21f15a8e9499138c (patch)
treea4ba27dbd239aee1278ec0500a4320e1f9434c69
parent8eedb72f6c6b39f6b5a4adcc2a8318628f6e3e49 (diff)
parentd7a6b5c66a278407228546a467c5e02e3f124b80 (diff)
downloaddragon-6c94033f42cc05ecf9036d9f21f15a8e9499138c.tar.gz
recovery: Add dependency on libedify. am: 7c62d00eee am: 603635710d
am: d7a6b5c66a Change-Id: I480088e72b2e6cb0528bf32195b5bf4f26efdcbb
-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,