From c86b6d43129790fbd31e4f124cb6d1bfafce0373 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Fri, 28 Apr 2017 22:43:09 +0300 Subject: Complete support for project pathmap * Use project pathmap when available for LOCAL_C_INCLUDES Change-Id: Iddc7cc8509d966307c4a490c9d6c15d761dbb3b4 --- applypatch/Android.mk | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'applypatch/Android.mk') diff --git a/applypatch/Android.mk b/applypatch/Android.mk index 581e53aa1..2f96f0ab7 100644 --- a/applypatch/Android.mk +++ b/applypatch/Android.mk @@ -14,6 +14,12 @@ LOCAL_PATH := $(call my-dir) +ifdef project-path-for + RECOVERY_PATH := $(call project-path-for,recovery) +else + RECOVERY_PATH := bootable/recovery +endif + include $(CLEAR_VARS) BOARD_RECOVERY_DEFINES := BOARD_BML_BOOT BOARD_BML_RECOVERY @@ -33,7 +39,7 @@ LOCAL_CLANG := true LOCAL_SRC_FILES := applypatch.cpp bspatch.cpp freecache.cpp imgpatch.cpp utils.cpp LOCAL_MODULE := libapplypatch LOCAL_MODULE_TAGS := eng -LOCAL_C_INCLUDES += bootable/recovery +LOCAL_C_INCLUDES += $(RECOVERY_PATH) LOCAL_STATIC_LIBRARIES += libbase libotafault libmtdutils libcrypto_static libbz libz include $(BUILD_STATIC_LIBRARY) @@ -46,7 +52,7 @@ include $(CLEAR_VARS) LOCAL_CLANG := true LOCAL_SRC_FILES := bspatch.cpp imgpatch.cpp utils.cpp LOCAL_MODULE := libimgpatch -LOCAL_C_INCLUDES += bootable/recovery +LOCAL_C_INCLUDES += $(RECOVERY_PATH) LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include LOCAL_STATIC_LIBRARIES += libcrypto_static libbz libz @@ -58,7 +64,7 @@ include $(CLEAR_VARS) LOCAL_CLANG := true LOCAL_SRC_FILES := main.cpp LOCAL_MODULE := applypatch -LOCAL_C_INCLUDES += bootable/recovery +LOCAL_C_INCLUDES += $(RECOVERY_PATH) LOCAL_STATIC_LIBRARIES += libapplypatch libbase libotafault libmtdutils libcrypto_static libbz \ libedify \ -- cgit v1.2.3