Merge "Revert "Move error_code.h into otautil."" am: b23d29642d

am: b87edb00dc

Change-Id: I43d041f1f59766066240f6e535f1b9839e783c25

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 \

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)

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);

error_code.h

@@ -75,4 +75,4 @@ enum UncryptErrorCode {
   kUncryptBlockDeviceFindError,
 };
 
-#endif  // _ERROR_CODE_H_
+#endif // _ERROR_CODE_H_

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"

otautil/Android.bp

@@ -15,8 +15,6 @@
 cc_library_static {
     name: "libotautil",
 
-    host_supported: true,
-
     srcs: [
         "SysUtil.cpp",
         "DirUtil.cpp",

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"

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"

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 \

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;

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"

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"