diff options
Diffstat (limited to 'applypatch/Android.mk')
| -rw-r--r-- | applypatch/Android.mk | 50 |
1 files changed, 26 insertions, 24 deletions
diff --git a/applypatch/Android.mk b/applypatch/Android.mk index f5dda2bc4..8fac2ffed 100644 --- a/applypatch/Android.mk +++ b/applypatch/Android.mk @@ -25,11 +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 \ @@ -49,10 +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 \ @@ -73,10 +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 \ @@ -94,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 @@ -108,22 +114,20 @@ 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 \ libedify \ libotafault \ - libbspatch \ - libbase \ - libziparchive \ - liblog \ - libcrypto \ - libbz + libotautil \ + libbspatch LOCAL_SHARED_LIBRARIES := \ libbase \ + libbz \ + libcrypto \ + liblog \ libz \ - libcutils + libziparchive LOCAL_CFLAGS := -Wall -Werror include $(BUILD_EXECUTABLE) @@ -137,6 +141,7 @@ libimgdiff_cflags := \ -DZLIB_CONST libimgdiff_static_libraries := \ + libotautil \ libbsdiff \ libdivsufsort \ libdivsufsort64 \ @@ -157,8 +162,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) @@ -173,8 +177,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) @@ -189,6 +192,5 @@ LOCAL_STATIC_LIBRARIES := \ $(libimgdiff_static_libraries) \ libbz LOCAL_C_INCLUDES := \ - $(LOCAL_PATH)/include \ - bootable/recovery + $(LOCAL_PATH)/include include $(BUILD_HOST_EXECUTABLE) |