summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorDante Russo <drusso@codeaurora.org>2017-06-26 17:59:41 -0700
committerDante Russo <drusso@codeaurora.org>2017-06-27 17:36:14 -0700
commitdc29f91ec62c028866c595a1eae622ab04b42f2b (patch)
treeb4790013a9c8664563ef4cbd72eb625acd178580 /android
parent1e31567ced60ed7970a990543bdf385ce0975b43 (diff)
downloadgps-dc29f91ec62c028866c595a1eae622ab04b42f2b.tar.gz
Removing header copying to out folder
Replace copying header files to out folder for use by other modules to instead build headers into separate libraries that end with _headers that can be used by other modules. Change-Id: I073967cd34e5c79110895908a4eef1b7d17bf9ea CRs-fixed: 2068129
Diffstat (limited to 'android')
-rw-r--r--android/Android.mk22
1 files changed, 12 insertions, 10 deletions
diff --git a/android/Android.mk b/android/Android.mk
index d3e33ab..58d30f0 100644
--- a/android/Android.mk
+++ b/android/Android.mk
@@ -24,11 +24,12 @@ LOCAL_SRC_FILES += \
location_api/MeasurementAPIClient.cpp \
LOCAL_C_INCLUDES:= \
- $(LOCAL_PATH)/location_api \
- $(TARGET_OUT_HEADERS)/gps.utils \
- $(TARGET_OUT_HEADERS)/libloc_core \
- $(TARGET_OUT_HEADERS)/libloc_pla \
- $(TARGET_OUT_HEADERS)/liblocation_api \
+ $(LOCAL_PATH)/location_api
+LOCAL_HEADER_LIBRARIES := \
+ libgps.utils_headers \
+ libloc_core_headers \
+ libloc_pla_headers \
+ liblocation_api_headers
LOCAL_SHARED_LIBRARIES := \
liblog \
@@ -64,11 +65,12 @@ LOCAL_SRC_FILES := \
service.cpp \
LOCAL_C_INCLUDES:= \
- $(LOCAL_PATH)/location_api \
- $(TARGET_OUT_HEADERS)/gps.utils \
- $(TARGET_OUT_HEADERS)/libloc_core \
- $(TARGET_OUT_HEADERS)/libloc_pla \
- $(TARGET_OUT_HEADERS)/liblocation_api \
+ $(LOCAL_PATH)/location_api
+LOCAL_HEADER_LIBRARIES := \
+ libgps.utils_headers \
+ libloc_core_headers \
+ libloc_pla_headers \
+ liblocation_api_headers
LOCAL_SHARED_LIBRARIES := \