diff options
| author | Tao Bao <tbao@google.com> | 2017-10-10 16:28:05 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-10-10 16:28:05 +0000 |
| commit | b56ea6e59542116c1951e4411186a5da82c78ce3 (patch) | |
| tree | 1d46fb110cb6d1a0d4ea2ffea3b8eaac32975c7d | |
| parent | fddf38b15e4eaf5faab95413300f53fc2a5c717d (diff) | |
| parent | 9800e8730621f31cc6bd4880fae7191b0c7b3d6f (diff) | |
| download | dragon-b56ea6e59542116c1951e4411186a5da82c78ce3.tar.gz | |
Merge "Update the path to error_code.h." am: 4aab2f3500
am: 9800e87306
Change-Id: I1cdaf9f2bf9f68b40fa4d47259ea05ce79378c61
| -rw-r--r-- | recovery/updater/Android.mk | 6 | ||||
| -rw-r--r-- | recovery/updater/recovery_updater.cpp | 5 |
2 files changed, 5 insertions, 6 deletions
diff --git a/recovery/updater/Android.mk b/recovery/updater/Android.mk index 7dc1efb..207aa91 100644 --- a/recovery/updater/Android.mk +++ b/recovery/updater/Android.mk @@ -13,13 +13,12 @@ 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 + libedify \ + libotautil include $(BUILD_STATIC_LIBRARY) @@ -49,7 +48,6 @@ LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := flash_ec.c flash_mtd.c flash_device.c vboot_interface.c debug_ec.c flash_file.cpp fwtool.cpp update_fw.cpp LOCAL_SHARED_LIBRARIES := liblog 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 := \ diff --git a/recovery/updater/recovery_updater.cpp b/recovery/updater/recovery_updater.cpp index b9b67f0..a478584 100644 --- a/recovery/updater/recovery_updater.cpp +++ b/recovery/updater/recovery_updater.cpp @@ -24,8 +24,9 @@ #include <string> #include <vector> -#include "edify/expr.h" -#include "error_code.h" +#include <edify/expr.h> +#include <otautil/error_code.h> + #include "update_fw.h" Value* firmware_update(const char *name, State * state, |