From 1fc5bf353a8719d16fd9ba29a661d211bad4038f Mon Sep 17 00:00:00 2001 From: Tao Bao Date: Fri, 6 Oct 2017 07:43:41 -0700 Subject: [PATCH] Revert "Revert "Move error_code.h into otautil."" This reverts commit 26436d6d6010d5323349af7e119ff8f34f85c40c to re-land "Move error_code.h into otautil.". This way it stops requiring relative path ".." in LOCAL_C_INCLUDES (uncrypt and edify). Soong doesn't accept non-local ".." in "local_include_dirs". This CL needs to land with device-specific module changes (e.g. adding the dependency on libotautil). Test: lunch aosp_{angler,bullhead,dragon,fugu,sailfish}-userdebug; mmma bootable/recovery Change-Id: If193241801af2dae73eccd31ce57cd2b81c9fd96 --- applypatch/Android.mk | 1 + edify/Android.mk | 5 +++-- edify/expr.cpp | 2 +- edify/expr.h | 2 +- install.cpp | 2 +- otautil/Android.bp | 2 ++ error_code.h => otautil/include/otautil/error_code.h | 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 +- updater/updater.cpp | 2 +- 14 files changed, 17 insertions(+), 13 deletions(-) rename error_code.h => otautil/include/otautil/error_code.h (98%) diff --git a/applypatch/Android.mk b/applypatch/Android.mk index db72e8ee..4eb0111d 100644 --- a/applypatch/Android.mk +++ b/applypatch/Android.mk @@ -116,6 +116,7 @@ LOCAL_STATIC_LIBRARIES := \ libapplypatch \ libedify \ libotafault \ + libotautil \ libbspatch \ libbase \ libziparchive \ diff --git a/edify/Android.mk b/edify/Android.mk index fbf2b1b0..527698e6 100644 --- a/edify/Android.mk +++ b/edify/Android.mk @@ -30,8 +30,9 @@ LOCAL_CFLAGS := -Wall -Werror LOCAL_CPPFLAGS := -Wno-unused-parameter LOCAL_CPPFLAGS += -Wno-deprecated-register LOCAL_MODULE := libedify -LOCAL_C_INCLUDES += $(LOCAL_PATH)/.. -LOCAL_STATIC_LIBRARIES += libbase +LOCAL_STATIC_LIBRARIES += \ + libotautil \ + libbase include $(BUILD_STATIC_LIBRARY) diff --git a/edify/expr.cpp b/edify/expr.cpp index 403162d6..104c0fd9 100644 --- a/edify/expr.cpp +++ b/edify/expr.cpp @@ -31,7 +31,7 @@ #include #include -#include "error_code.h" +#include "otautil/error_code.h" // Functions should: // diff --git a/edify/expr.h b/edify/expr.h index 32828028..770d1cf0 100644 --- a/edify/expr.h +++ b/edify/expr.h @@ -23,7 +23,7 @@ #include #include -// Forward declaration to avoid including "error_code.h". +// Forward declaration to avoid including "otautil/error_code.h". enum ErrorCode : int; enum CauseCode : int; diff --git a/install.cpp b/install.cpp index 74d1a68b..d0589317 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 9cde7baa..5905ba64 100644 --- a/otautil/Android.bp +++ b/otautil/Android.bp @@ -15,6 +15,8 @@ cc_library_static { name: "libotautil", + host_supported: true, + srcs: [ "SysUtil.cpp", "DirUtil.cpp", diff --git a/error_code.h b/otautil/include/otautil/error_code.h similarity index 98% rename from error_code.h rename to otautil/include/otautil/error_code.h index 26b9bb40..b0ff42d8 100644 --- a/error_code.h +++ b/otautil/include/otautil/error_code.h @@ -75,4 +75,4 @@ enum UncryptErrorCode : int { kUncryptBlockDeviceFindError, }; -#endif // _ERROR_CODE_H_ +#endif // _ERROR_CODE_H_ diff --git a/recovery.cpp b/recovery.cpp index 4dc5b540..243ee4af 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 2a0575a3..e35870dc 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 a3b0ca98..601f9276 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 7a2ccbc7..645faadb 100644 --- a/uncrypt/uncrypt.cpp +++ b/uncrypt/uncrypt.cpp @@ -116,7 +116,7 @@ #include #include -#include "error_code.h" +#include "otautil/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 696cddf4..0f836444 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 fc085d5a..01210f51 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" diff --git a/updater/updater.cpp b/updater/updater.cpp index 309c309a..f55a0d3b 100644 --- a/updater/updater.cpp +++ b/updater/updater.cpp @@ -31,10 +31,10 @@ #include #include "edify/expr.h" -#include "error_code.h" #include "otafault/config.h" #include "otautil/DirUtil.h" #include "otautil/SysUtil.h" +#include "otautil/error_code.h" #include "updater/blockimg.h" #include "updater/install.h"