diff options
author | Tao Bao <tbao@google.com> | 2017-10-11 19:19:13 +0200 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-10-11 19:19:13 +0200 |
commit | 684f239b4b33d51b131e9f353d7b8f15744f2043 (patch) | |
tree | 6bbf2b6051bdc1688c0400f86fb662a2d970013d /applypatch/Android.mk | |
parent | Merge "otautil: Fix mac build." am: eb8a064066 (diff) | |
parent | Merge "Move rangeset.h and print_sha1.h into otautil." (diff) | |
download | android_bootable_recovery-684f239b4b33d51b131e9f353d7b8f15744f2043.tar android_bootable_recovery-684f239b4b33d51b131e9f353d7b8f15744f2043.tar.gz android_bootable_recovery-684f239b4b33d51b131e9f353d7b8f15744f2043.tar.bz2 android_bootable_recovery-684f239b4b33d51b131e9f353d7b8f15744f2043.tar.lz android_bootable_recovery-684f239b4b33d51b131e9f353d7b8f15744f2043.tar.xz android_bootable_recovery-684f239b4b33d51b131e9f353d7b8f15744f2043.tar.zst android_bootable_recovery-684f239b4b33d51b131e9f353d7b8f15744f2043.zip |
Diffstat (limited to '')
-rw-r--r-- | applypatch/Android.mk | 34 |
1 files changed, 17 insertions, 17 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) |