summaryrefslogtreecommitdiffstats
path: root/applypatch
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2017-10-11 19:09:25 +0200
committerGerrit Code Review <noreply-gerritcodereview@google.com>2017-10-11 19:09:25 +0200
commitff9b6f63a289c792eb69e7fee59a1f308e9fc4aa (patch)
tree415073930d2bb71cae132e38a57cea3f2c15d7e1 /applypatch
parentMerge "otautil: Fix mac build." (diff)
parentMove rangeset.h and print_sha1.h into otautil. (diff)
downloadandroid_bootable_recovery-ff9b6f63a289c792eb69e7fee59a1f308e9fc4aa.tar
android_bootable_recovery-ff9b6f63a289c792eb69e7fee59a1f308e9fc4aa.tar.gz
android_bootable_recovery-ff9b6f63a289c792eb69e7fee59a1f308e9fc4aa.tar.bz2
android_bootable_recovery-ff9b6f63a289c792eb69e7fee59a1f308e9fc4aa.tar.lz
android_bootable_recovery-ff9b6f63a289c792eb69e7fee59a1f308e9fc4aa.tar.xz
android_bootable_recovery-ff9b6f63a289c792eb69e7fee59a1f308e9fc4aa.tar.zst
android_bootable_recovery-ff9b6f63a289c792eb69e7fee59a1f308e9fc4aa.zip
Diffstat (limited to 'applypatch')
-rw-r--r--applypatch/Android.mk34
-rw-r--r--applypatch/applypatch.cpp2
-rw-r--r--applypatch/bspatch.cpp2
-rw-r--r--applypatch/imgdiff.cpp2
-rw-r--r--applypatch/include/applypatch/imgdiff_image.h2
5 files changed, 21 insertions, 21 deletions
diff --git a/applypatch/Android.mk b/applypatch/Android.mk
index 05d937004..66494e607 100644
--- a/applypatch/Android.mk
+++ b/applypatch/Android.mk
@@ -25,12 +25,13 @@ LOCAL_SRC_FILES := \
LOCAL_MODULE := libapplypatch
LOCAL_MODULE_TAGS := eng
LOCAL_C_INCLUDES := \
- $(LOCAL_PATH)/include \
- bootable/recovery
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
+ $(LOCAL_PATH)/include
+LOCAL_EXPORT_C_INCLUDE_DIRS := \
+ $(LOCAL_PATH)/include
LOCAL_STATIC_LIBRARIES := \
libedify \
libotafault \
+ libotautil \
libbase \
libcrypto \
libbspatch \
@@ -50,11 +51,12 @@ LOCAL_SRC_FILES := \
imgpatch.cpp
LOCAL_MODULE := libimgpatch
LOCAL_C_INCLUDES := \
- $(LOCAL_PATH)/include \
- bootable/recovery
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
+ $(LOCAL_PATH)/include
+LOCAL_EXPORT_C_INCLUDE_DIRS := \
+ $(LOCAL_PATH)/include
LOCAL_STATIC_LIBRARIES := \
libedify \
+ libotautil \
libcrypto \
libbspatch \
libbase \
@@ -75,11 +77,12 @@ LOCAL_SRC_FILES := \
LOCAL_MODULE := libimgpatch
LOCAL_MODULE_HOST_OS := linux
LOCAL_C_INCLUDES := \
- $(LOCAL_PATH)/include \
- bootable/recovery
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
+ $(LOCAL_PATH)/include
+LOCAL_EXPORT_C_INCLUDE_DIRS := \
+ $(LOCAL_PATH)/include
LOCAL_STATIC_LIBRARIES := \
libedify \
+ libotautil \
libcrypto \
libbspatch \
libbase \
@@ -97,9 +100,9 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES := \
applypatch_modes.cpp
LOCAL_MODULE := libapplypatch_modes
-LOCAL_C_INCLUDES := bootable/recovery
LOCAL_STATIC_LIBRARIES := \
libapplypatch \
+ libotautil \
libbase \
libedify \
libcrypto
@@ -111,7 +114,6 @@ include $(BUILD_STATIC_LIBRARY)
include $(CLEAR_VARS)
LOCAL_SRC_FILES := applypatch_main.cpp
LOCAL_MODULE := applypatch
-LOCAL_C_INCLUDES := bootable/recovery
LOCAL_STATIC_LIBRARIES := \
libapplypatch_modes \
libapplypatch \
@@ -141,6 +143,7 @@ libimgdiff_cflags := \
-DZLIB_CONST
libimgdiff_static_libraries := \
+ libotautil \
libbsdiff \
libdivsufsort \
libdivsufsort64 \
@@ -161,8 +164,7 @@ LOCAL_CFLAGS := \
LOCAL_STATIC_LIBRARIES := \
$(libimgdiff_static_libraries)
LOCAL_C_INCLUDES := \
- $(LOCAL_PATH)/include \
- bootable/recovery
+ $(LOCAL_PATH)/include
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
include $(BUILD_STATIC_LIBRARY)
@@ -177,8 +179,7 @@ LOCAL_CFLAGS := \
LOCAL_STATIC_LIBRARIES := \
$(libimgdiff_static_libraries)
LOCAL_C_INCLUDES := \
- $(LOCAL_PATH)/include \
- bootable/recovery
+ $(LOCAL_PATH)/include
LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
include $(BUILD_HOST_STATIC_LIBRARY)
@@ -193,6 +194,5 @@ LOCAL_STATIC_LIBRARIES := \
$(libimgdiff_static_libraries) \
libbz
LOCAL_C_INCLUDES := \
- $(LOCAL_PATH)/include \
- bootable/recovery
+ $(LOCAL_PATH)/include
include $(BUILD_HOST_EXECUTABLE)
diff --git a/applypatch/applypatch.cpp b/applypatch/applypatch.cpp
index 729d2a910..c8b75df79 100644
--- a/applypatch/applypatch.cpp
+++ b/applypatch/applypatch.cpp
@@ -40,7 +40,7 @@
#include "edify/expr.h"
#include "otafault/ota_io.h"
-#include "print_sha1.h"
+#include "otautil/print_sha1.h"
static int LoadPartitionContents(const std::string& filename, FileContents* file);
static size_t FileSink(const unsigned char* data, size_t len, int fd);
diff --git a/applypatch/bspatch.cpp b/applypatch/bspatch.cpp
index b2f29fbd6..c291464a8 100644
--- a/applypatch/bspatch.cpp
+++ b/applypatch/bspatch.cpp
@@ -31,7 +31,7 @@
#include "applypatch/applypatch.h"
#include "edify/expr.h"
-#include "print_sha1.h"
+#include "otautil/print_sha1.h"
void ShowBSDiffLicense() {
puts("The bsdiff library used herein is:\n"
diff --git a/applypatch/imgdiff.cpp b/applypatch/imgdiff.cpp
index c887a854d..3a61a7d0d 100644
--- a/applypatch/imgdiff.cpp
+++ b/applypatch/imgdiff.cpp
@@ -166,7 +166,7 @@
#include <zlib.h>
#include "applypatch/imgdiff_image.h"
-#include "rangeset.h"
+#include "otautil/rangeset.h"
using android::base::get_unaligned;
diff --git a/applypatch/include/applypatch/imgdiff_image.h b/applypatch/include/applypatch/imgdiff_image.h
index 491043dc1..3d29547cb 100644
--- a/applypatch/include/applypatch/imgdiff_image.h
+++ b/applypatch/include/applypatch/imgdiff_image.h
@@ -29,7 +29,7 @@
#include <zlib.h>
#include "imgdiff.h"
-#include "rangeset.h"
+#include "otautil/rangeset.h"
class ImageChunk {
public: