diff options
| -rw-r--r-- | applypatch/Android.mk | 5 | ||||
| -rw-r--r-- | edify/Android.mk | 5 | ||||
| -rw-r--r-- | edify/expr.h | 2 | ||||
| -rw-r--r-- | error_code.h (renamed from otautil/include/otautil/error_code.h) | 2 | ||||
| -rw-r--r-- | install.cpp | 2 | ||||
| -rw-r--r-- | otautil/Android.bp | 2 | ||||
| -rw-r--r-- | recovery.cpp | 2 | ||||
| -rw-r--r-- | tests/component/updater_test.cpp | 2 | ||||
| -rw-r--r-- | uncrypt/Android.mk | 2 | ||||
| -rw-r--r-- | uncrypt/uncrypt.cpp | 2 | ||||
| -rw-r--r-- | updater/blockimg.cpp | 2 | ||||
| -rw-r--r-- | updater/install.cpp | 2 |
12 files changed, 11 insertions, 19 deletions
diff --git a/applypatch/Android.mk b/applypatch/Android.mk index f02957e7e..f5dda2bc4 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 db7b5b6b5..cec65f42a 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 f2a4d6dcf..4838d20c0 100644 --- a/edify/expr.h +++ b/edify/expr.h @@ -23,7 +23,7 @@ #include <string> #include <vector> -#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 index 943c7622d..4e3032bc9 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 d05893171..74d1a68b3 100644 --- a/install.cpp +++ b/install.cpp @@ -49,9 +49,9 @@ #include <ziparchive/zip_archive.h> #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 5905ba649..9cde7baa7 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 243ee4af3..4dc5b540e 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 e35870dc7..2a0575a31 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 601f9276e..a3b0ca98d 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 645faadbf..7a2ccbc7c 100644 --- a/uncrypt/uncrypt.cpp +++ b/uncrypt/uncrypt.cpp @@ -116,7 +116,7 @@ #include <cutils/sockets.h> #include <fs_mgr.h> -#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 0f8364441..696cddf41 100644 --- a/updater/blockimg.cpp +++ b/updater/blockimg.cpp @@ -50,8 +50,8 @@ #include <ziparchive/zip_archive.h> #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 01210f51c..fc085d5aa 100644 --- a/updater/install.cpp +++ b/updater/install.cpp @@ -57,10 +57,10 @@ #include <ziparchive/zip_archive.h> #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" |