aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Bao2017-10-05 12:16:31 -0500
committerTao Bao2017-10-05 12:16:31 -0500
commit26436d6d6010d5323349af7e119ff8f34f85c40c (patch)
tree538f084ed5750d2dc0992deec0c3dc372cd53794
parent623fe7e701d5d0fb17082d1ced14498af1b44e5b (diff)
downloadplatform-bootable-recovery-26436d6d6010d5323349af7e119ff8f34f85c40c.tar.gz
platform-bootable-recovery-26436d6d6010d5323349af7e119ff8f34f85c40c.tar.xz
platform-bootable-recovery-26436d6d6010d5323349af7e119ff8f34f85c40c.zip
Revert "Move error_code.h into otautil."
This reverts commit 623fe7e701d5d0fb17082d1ced14498af1b44e5b. Reason for revert: Need to address device-specific modules. Change-Id: Ib7a4191e7f193dfff49b02d3de76dda856800251
-rw-r--r--applypatch/Android.mk5
-rw-r--r--edify/Android.mk5
-rw-r--r--edify/expr.h2
-rw-r--r--error_code.h (renamed from otautil/include/otautil/error_code.h)2
-rw-r--r--install.cpp2
-rw-r--r--otautil/Android.bp2
-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
12 files changed, 11 insertions, 19 deletions
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 := \
30LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include 30LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
31LOCAL_STATIC_LIBRARIES := \ 31LOCAL_STATIC_LIBRARIES := \
32 libotafault \ 32 libotafault \
33 libotautil \
34 libbase \ 33 libbase \
35 libcrypto \ 34 libcrypto \
36 libbspatch \ 35 libbspatch \
@@ -54,7 +53,6 @@ LOCAL_C_INCLUDES := \
54 bootable/recovery 53 bootable/recovery
55LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include 54LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
56LOCAL_STATIC_LIBRARIES := \ 55LOCAL_STATIC_LIBRARIES := \
57 libotautil \
58 libcrypto \ 56 libcrypto \
59 libbspatch \ 57 libbspatch \
60 libbase \ 58 libbase \
@@ -79,7 +77,6 @@ LOCAL_C_INCLUDES := \
79 bootable/recovery 77 bootable/recovery
80LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include 78LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
81LOCAL_STATIC_LIBRARIES := \ 79LOCAL_STATIC_LIBRARIES := \
82 libotautil \
83 libcrypto \ 80 libcrypto \
84 libbspatch \ 81 libbspatch \
85 libbase \ 82 libbase \
@@ -102,7 +99,6 @@ LOCAL_STATIC_LIBRARIES := \
102 libapplypatch \ 99 libapplypatch \
103 libbase \ 100 libbase \
104 libedify \ 101 libedify \
105 libotautil \
106 libcrypto 102 libcrypto
107LOCAL_CFLAGS := -Wall -Werror 103LOCAL_CFLAGS := -Wall -Werror
108include $(BUILD_STATIC_LIBRARY) 104include $(BUILD_STATIC_LIBRARY)
@@ -118,7 +114,6 @@ LOCAL_STATIC_LIBRARIES := \
118 libapplypatch \ 114 libapplypatch \
119 libedify \ 115 libedify \
120 libotafault \ 116 libotafault \
121 libotautil \
122 libbspatch \ 117 libbspatch \
123 libbase \ 118 libbase \
124 libziparchive \ 119 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
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_STATIC_LIBRARIES += \ 33LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
34 libotautil \ 34LOCAL_STATIC_LIBRARIES += libbase
35 libbase
36 35
37include $(BUILD_STATIC_LIBRARY) 36include $(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 @@
23#include <string> 23#include <string>
24#include <vector> 24#include <vector>
25 25
26#include "otautil/error_code.h" 26#include "error_code.h"
27 27
28struct State { 28struct State {
29 State(const std::string& script, void* cookie); 29 State(const std::string& script, void* cookie);
diff --git a/otautil/include/otautil/error_code.h b/error_code.h
index 943c7622..4e3032bc 100644
--- a/otautil/include/otautil/error_code.h
+++ b/error_code.h
@@ -75,4 +75,4 @@ enum UncryptErrorCode {
75 kUncryptBlockDeviceFindError, 75 kUncryptBlockDeviceFindError,
76}; 76};
77 77
78#endif // _ERROR_CODE_H_ 78#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 @@
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"
52#include "otautil/SysUtil.h" 53#include "otautil/SysUtil.h"
53#include "otautil/ThermalUtil.h" 54#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 5905ba64..9cde7baa 100644
--- a/otautil/Android.bp
+++ b/otautil/Android.bp
@@ -15,8 +15,6 @@
15cc_library_static { 15cc_library_static {
16 name: "libotautil", 16 name: "libotautil",
17 17
18 host_supported: true,
19
20 srcs: [ 18 srcs: [
21 "SysUtil.cpp", 19 "SysUtil.cpp",
22 "DirUtil.cpp", 20 "DirUtil.cpp",
diff --git a/recovery.cpp b/recovery.cpp
index 243ee4af..4dc5b540 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"
64#include "fuse_sdcard_provider.h" 65#include "fuse_sdcard_provider.h"
65#include "fuse_sideload.h" 66#include "fuse_sideload.h"
66#include "install.h" 67#include "install.h"
67#include "minadbd/minadbd.h" 68#include "minadbd/minadbd.h"
68#include "minui/minui.h" 69#include "minui/minui.h"
69#include "otautil/DirUtil.h" 70#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 e35870dc..2a0575a3 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"
42#include "otautil/SysUtil.h" 43#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 601f9276..a3b0ca98 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)/..
20LOCAL_MODULE := uncrypt 21LOCAL_MODULE := uncrypt
21LOCAL_STATIC_LIBRARIES := \ 22LOCAL_STATIC_LIBRARIES := \
22 libbootloader_message \ 23 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 645faadb..7a2ccbc7 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 "otautil/error_code.h" 119#include "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 0f836444..696cddf4 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"
53#include "otafault/ota_io.h" 54#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 01210f51..fc085d5a 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"
60#include "mounts.h" 61#include "mounts.h"
61#include "otafault/ota_io.h" 62#include "otafault/ota_io.h"
62#include "otautil/DirUtil.h" 63#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"