From 26436d6d6010d5323349af7e119ff8f34f85c40c Mon Sep 17 00:00:00 2001 From: Tao Bao Date: Thu, 5 Oct 2017 17:16:31 +0000 Subject: [PATCH] Revert "Move error_code.h into otautil." This reverts commit 623fe7e701d5d0fb17082d1ced14498af1b44e5b. Reason for revert: Need to address device-specific modules. Change-Id: Ib7a4191e7f193dfff49b02d3de76dda856800251 --- applypatch/Android.mk | 5 ----- edify/Android.mk | 5 ++--- edify/expr.h | 2 +- otautil/include/otautil/error_code.h => error_code.h | 2 +- install.cpp | 2 +- otautil/Android.bp | 2 -- recovery.cpp | 2 +- tests/component/updater_test.cpp | 2 +- uncrypt/Android.mk | 2 +- uncrypt/uncrypt.cpp | 2 +- updater/blockimg.cpp | 2 +- updater/install.cpp | 2 +- 12 files changed, 11 insertions(+), 19 deletions(-) rename otautil/include/otautil/error_code.h => error_code.h (98%) diff --git a/applypatch/Android.mk b/applypatch/Android.mk index f02957e7..f5dda2bc 100644 --- a/applypatch/Android.mk +++ b/applypatch/Android.mk @@ -30,7 +30,6 @@ LOCAL_C_INCLUDES := \ LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include LOCAL_STATIC_LIBRARIES := \ libotafault \ - libotautil \ libbase \ libcrypto \ libbspatch \ @@ -54,7 +53,6 @@ LOCAL_C_INCLUDES := \ bootable/recovery LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include LOCAL_STATIC_LIBRARIES := \ - libotautil \ libcrypto \ libbspatch \ libbase \ @@ -79,7 +77,6 @@ LOCAL_C_INCLUDES := \ bootable/recovery LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include LOCAL_STATIC_LIBRARIES := \ - libotautil \ libcrypto \ libbspatch \ libbase \ @@ -102,7 +99,6 @@ LOCAL_STATIC_LIBRARIES := \ libapplypatch \ libbase \ libedify \ - libotautil \ libcrypto LOCAL_CFLAGS := -Wall -Werror include $(BUILD_STATIC_LIBRARY) @@ -118,7 +114,6 @@ LOCAL_STATIC_LIBRARIES := \ libapplypatch \ libedify \ libotafault \ - libotautil \ libbspatch \ libbase \ libziparchive \ diff --git a/edify/Android.mk b/edify/Android.mk index db7b5b6b..cec65f42 100644 --- a/edify/Android.mk +++ b/edify/Android.mk @@ -30,8 +30,7 @@ LOCAL_CFLAGS := -Wall -Werror LOCAL_CPPFLAGS := -Wno-unused-parameter LOCAL_CPPFLAGS += -Wno-deprecated-register LOCAL_MODULE := libedify -LOCAL_STATIC_LIBRARIES += \ - libotautil \ - libbase +LOCAL_C_INCLUDES += $(LOCAL_PATH)/.. +LOCAL_STATIC_LIBRARIES += libbase include $(BUILD_STATIC_LIBRARY) diff --git a/edify/expr.h b/edify/expr.h index f2a4d6dc..4838d20c 100644 --- a/edify/expr.h +++ b/edify/expr.h @@ -23,7 +23,7 @@ #include #include -#include "otautil/error_code.h" +#include "error_code.h" struct State { State(const std::string& script, void* cookie); diff --git a/otautil/include/otautil/error_code.h b/error_code.h similarity index 98% rename from otautil/include/otautil/error_code.h rename to error_code.h index 943c7622..4e3032bc 100644 --- a/otautil/include/otautil/error_code.h +++ b/error_code.h @@ -75,4 +75,4 @@ enum UncryptErrorCode { kUncryptBlockDeviceFindError, }; -#endif // _ERROR_CODE_H_ +#endif // _ERROR_CODE_H_ diff --git a/install.cpp b/install.cpp index d0589317..74d1a68b 100644 --- a/install.cpp +++ b/install.cpp @@ -49,9 +49,9 @@ #include #include "common.h" +#include "error_code.h" #include "otautil/SysUtil.h" #include "otautil/ThermalUtil.h" -#include "otautil/error_code.h" #include "private/install.h" #include "roots.h" #include "ui.h" diff --git a/otautil/Android.bp b/otautil/Android.bp index 5905ba64..9cde7baa 100644 --- a/otautil/Android.bp +++ b/otautil/Android.bp @@ -15,8 +15,6 @@ cc_library_static { name: "libotautil", - host_supported: true, - srcs: [ "SysUtil.cpp", "DirUtil.cpp", diff --git a/recovery.cpp b/recovery.cpp index 243ee4af..4dc5b540 100644 --- a/recovery.cpp +++ b/recovery.cpp @@ -61,13 +61,13 @@ #include "adb_install.h" #include "common.h" #include "device.h" +#include "error_code.h" #include "fuse_sdcard_provider.h" #include "fuse_sideload.h" #include "install.h" #include "minadbd/minadbd.h" #include "minui/minui.h" #include "otautil/DirUtil.h" -#include "otautil/error_code.h" #include "roots.h" #include "rotate_logs.h" #include "screen_ui.h" diff --git a/tests/component/updater_test.cpp b/tests/component/updater_test.cpp index e35870dc..2a0575a3 100644 --- a/tests/component/updater_test.cpp +++ b/tests/component/updater_test.cpp @@ -39,8 +39,8 @@ #include "common/test_constants.h" #include "edify/expr.h" +#include "error_code.h" #include "otautil/SysUtil.h" -#include "otautil/error_code.h" #include "print_sha1.h" #include "updater/blockimg.h" #include "updater/install.h" diff --git a/uncrypt/Android.mk b/uncrypt/Android.mk index 601f9276..a3b0ca98 100644 --- a/uncrypt/Android.mk +++ b/uncrypt/Android.mk @@ -17,10 +17,10 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_SRC_FILES := uncrypt.cpp +LOCAL_C_INCLUDES := $(LOCAL_PATH)/.. LOCAL_MODULE := uncrypt LOCAL_STATIC_LIBRARIES := \ libbootloader_message \ - libotautil \ libbase \ liblog \ libfs_mgr \ diff --git a/uncrypt/uncrypt.cpp b/uncrypt/uncrypt.cpp index 645faadb..7a2ccbc7 100644 --- a/uncrypt/uncrypt.cpp +++ b/uncrypt/uncrypt.cpp @@ -116,7 +116,7 @@ #include #include -#include "otautil/error_code.h" +#include "error_code.h" static constexpr int WINDOW_SIZE = 5; static constexpr int FIBMAP_RETRY_LIMIT = 3; diff --git a/updater/blockimg.cpp b/updater/blockimg.cpp index 0f836444..696cddf4 100644 --- a/updater/blockimg.cpp +++ b/updater/blockimg.cpp @@ -50,8 +50,8 @@ #include #include "edify/expr.h" +#include "error_code.h" #include "otafault/ota_io.h" -#include "otautil/error_code.h" #include "print_sha1.h" #include "rangeset.h" #include "updater/install.h" diff --git a/updater/install.cpp b/updater/install.cpp index 01210f51..fc085d5a 100644 --- a/updater/install.cpp +++ b/updater/install.cpp @@ -57,10 +57,10 @@ #include #include "edify/expr.h" +#include "error_code.h" #include "mounts.h" #include "otafault/ota_io.h" #include "otautil/DirUtil.h" -#include "otautil/error_code.h" #include "print_sha1.h" #include "tune2fs.h" #include "updater/updater.h"