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 --- otafault/Android.mk | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'otafault/Android.mk') diff --git a/otafault/Android.mk b/otafault/Android.mk index ba7add855..e8241f4c4 100644 --- a/otafault/Android.mk +++ b/otafault/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) otafault_static_libs := \ @@ -26,7 +32,7 @@ LOCAL_SRC_FILES := config.cpp ota_io.cpp LOCAL_MODULE_TAGS := eng LOCAL_MODULE := libotafault LOCAL_CLANG := true -LOCAL_C_INCLUDES := bootable/recovery +LOCAL_C_INCLUDES := $(RECOVERY_PATH) LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) LOCAL_WHOLE_STATIC_LIBRARIES := $(otafault_static_libs) @@ -38,7 +44,7 @@ LOCAL_SRC_FILES := config.cpp ota_io.cpp test.cpp LOCAL_MODULE_TAGS := tests LOCAL_MODULE := otafault_test LOCAL_STATIC_LIBRARIES := $(otafault_static_libs) -LOCAL_C_INCLUDES := bootable/recovery +LOCAL_C_INCLUDES := $(RECOVERY_PATH) LOCAL_FORCE_STATIC_EXECUTABLE := true include $(BUILD_EXECUTABLE) -- cgit v1.2.3