aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--applypatch/Android.mk1
-rw-r--r--edify/Android.mk5
-rw-r--r--edify/expr.cpp2
-rw-r--r--edify/expr.h2
-rw-r--r--install.cpp2
-rw-r--r--otautil/Android.bp2
-rw-r--r--otautil/include/otautil/error_code.h (renamed from error_code.h)2
-rw-r--r--recovery.cpp2
-rw-r--r--tests/component/updater_test.cpp2
-rw-r--r--uncrypt/Android.mk2
-rw-r--r--uncrypt/uncrypt.cpp2
-rw-r--r--updater/blockimg.cpp2
-rw-r--r--updater/install.cpp2
-rw-r--r--updater/updater.cpp2
14 files changed, 17 insertions, 13 deletions
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 := \
116 libapplypatch \ 116 libapplypatch \
117 libedify \ 117 libedify \
118 libotafault \ 118 libotafault \
119 libotautil \
119 libbspatch \ 120 libbspatch \
120 libbase \ 121 libbase \
121 libziparchive \ 122 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
30LOCAL_CPPFLAGS := -Wno-unused-parameter 30LOCAL_CPPFLAGS := -Wno-unused-parameter
31LOCAL_CPPFLAGS += -Wno-deprecated-register 31LOCAL_CPPFLAGS += -Wno-deprecated-register
32LOCAL_MODULE := libedify 32LOCAL_MODULE := libedify
33LOCAL_C_INCLUDES += $(LOCAL_PATH)/.. 33LOCAL_STATIC_LIBRARIES += \
34LOCAL_STATIC_LIBRARIES += libbase 34 libotautil \
35 libbase
35 36
36include $(BUILD_STATIC_LIBRARY) 37include $(BUILD_STATIC_LIBRARY)
37 38
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 @@
31#include <android-base/stringprintf.h> 31#include <android-base/stringprintf.h>
32#include <android-base/strings.h> 32#include <android-base/strings.h>
33 33
34#include "error_code.h" 34#include "otautil/error_code.h"
35 35
36// Functions should: 36// Functions should:
37// 37//
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 @@
23#include <string> 23#include <string>
24#include <vector> 24#include <vector>
25 25
26// Forward declaration to avoid including "error_code.h". 26// Forward declaration to avoid including "otautil/error_code.h".
27enum ErrorCode : int; 27enum ErrorCode : int;
28enum CauseCode : int; 28enum CauseCode : int;
29 29
diff --git a/install.cpp b/install.cpp
index 74d1a68b..d0589317 100644
--- a/install.cpp
+++ b/install.cpp
@@ -49,9 +49,9 @@
49#include <ziparchive/zip_archive.h> 49#include <ziparchive/zip_archive.h>
50 50
51#include "common.h" 51#include "common.h"
52#include "error_code.h"
53#include "otautil/SysUtil.h" 52#include "otautil/SysUtil.h"
54#include "otautil/ThermalUtil.h" 53#include "otautil/ThermalUtil.h"
54#include "otautil/error_code.h"
55#include "private/install.h" 55#include "private/install.h"
56#include "roots.h" 56#include "roots.h"
57#include "ui.h" 57#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 @@
15cc_library_static { 15cc_library_static {
16 name: "libotautil", 16 name: "libotautil",
17 17
18 host_supported: true,
19
18 srcs: [ 20 srcs: [
19 "SysUtil.cpp", 21 "SysUtil.cpp",
20 "DirUtil.cpp", 22 "DirUtil.cpp",
diff --git a/error_code.h b/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 {
75 kUncryptBlockDeviceFindError, 75 kUncryptBlockDeviceFindError,
76}; 76};
77 77
78#endif // _ERROR_CODE_H_ 78#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 @@
61#include "adb_install.h" 61#include "adb_install.h"
62#include "common.h" 62#include "common.h"
63#include "device.h" 63#include "device.h"
64#include "error_code.h"
65#include "fuse_sdcard_provider.h" 64#include "fuse_sdcard_provider.h"
66#include "fuse_sideload.h" 65#include "fuse_sideload.h"
67#include "install.h" 66#include "install.h"
68#include "minadbd/minadbd.h" 67#include "minadbd/minadbd.h"
69#include "minui/minui.h" 68#include "minui/minui.h"
70#include "otautil/DirUtil.h" 69#include "otautil/DirUtil.h"
70#include "otautil/error_code.h"
71#include "roots.h" 71#include "roots.h"
72#include "rotate_logs.h" 72#include "rotate_logs.h"
73#include "screen_ui.h" 73#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 @@
39 39
40#include "common/test_constants.h" 40#include "common/test_constants.h"
41#include "edify/expr.h" 41#include "edify/expr.h"
42#include "error_code.h"
43#include "otautil/SysUtil.h" 42#include "otautil/SysUtil.h"
43#include "otautil/error_code.h"
44#include "print_sha1.h" 44#include "print_sha1.h"
45#include "updater/blockimg.h" 45#include "updater/blockimg.h"
46#include "updater/install.h" 46#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)
17include $(CLEAR_VARS) 17include $(CLEAR_VARS)
18 18
19LOCAL_SRC_FILES := uncrypt.cpp 19LOCAL_SRC_FILES := uncrypt.cpp
20LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
21LOCAL_MODULE := uncrypt 20LOCAL_MODULE := uncrypt
22LOCAL_STATIC_LIBRARIES := \ 21LOCAL_STATIC_LIBRARIES := \
23 libbootloader_message \ 22 libbootloader_message \
23 libotautil \
24 libbase \ 24 libbase \
25 liblog \ 25 liblog \
26 libfs_mgr \ 26 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 @@
116#include <cutils/sockets.h> 116#include <cutils/sockets.h>
117#include <fs_mgr.h> 117#include <fs_mgr.h>
118 118
119#include "error_code.h" 119#include "otautil/error_code.h"
120 120
121static constexpr int WINDOW_SIZE = 5; 121static constexpr int WINDOW_SIZE = 5;
122static constexpr int FIBMAP_RETRY_LIMIT = 3; 122static 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 @@
50#include <ziparchive/zip_archive.h> 50#include <ziparchive/zip_archive.h>
51 51
52#include "edify/expr.h" 52#include "edify/expr.h"
53#include "error_code.h"
54#include "otafault/ota_io.h" 53#include "otafault/ota_io.h"
54#include "otautil/error_code.h"
55#include "print_sha1.h" 55#include "print_sha1.h"
56#include "rangeset.h" 56#include "rangeset.h"
57#include "updater/install.h" 57#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 @@
57#include <ziparchive/zip_archive.h> 57#include <ziparchive/zip_archive.h>
58 58
59#include "edify/expr.h" 59#include "edify/expr.h"
60#include "error_code.h"
61#include "mounts.h" 60#include "mounts.h"
62#include "otafault/ota_io.h" 61#include "otafault/ota_io.h"
63#include "otautil/DirUtil.h" 62#include "otautil/DirUtil.h"
63#include "otautil/error_code.h"
64#include "print_sha1.h" 64#include "print_sha1.h"
65#include "tune2fs.h" 65#include "tune2fs.h"
66#include "updater/updater.h" 66#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 @@
31#include <ziparchive/zip_archive.h> 31#include <ziparchive/zip_archive.h>
32 32
33#include "edify/expr.h" 33#include "edify/expr.h"
34#include "error_code.h"
35#include "otafault/config.h" 34#include "otafault/config.h"
36#include "otautil/DirUtil.h" 35#include "otautil/DirUtil.h"
37#include "otautil/SysUtil.h" 36#include "otautil/SysUtil.h"
37#include "otautil/error_code.h"
38#include "updater/blockimg.h" 38#include "updater/blockimg.h"
39#include "updater/install.h" 39#include "updater/install.h"
40 40