From dc29f91ec62c028866c595a1eae622ab04b42f2b Mon Sep 17 00:00:00 2001 From: Dante Russo Date: Mon, 26 Jun 2017 17:59:41 -0700 Subject: [PATCH] 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 --- android/Android.mk | 22 +++++++------ core/Android.mk | 25 ++++++--------- gnss/Android.mk | 10 +++--- location/Android.mk | 15 +++++---- utils/Android.mk | 31 +++++-------------- .../loc_pla/src/Android.mk | 23 ++++++-------- .../loc_stub/src/Android.mk | 15 ++++----- 7 files changed, 57 insertions(+), 84 deletions(-) diff --git a/android/Android.mk b/android/Android.mk index d3e33ab2..58d30f0d 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 := \ diff --git a/core/Android.mk b/core/Android.mk index 313ee25d..cc993334 100644 --- a/core/Android.mk +++ b/core/Android.mk @@ -37,24 +37,17 @@ LOCAL_CFLAGS += \ -fno-short-enums \ -D_ANDROID_ -LOCAL_C_INCLUDES:= \ - $(TARGET_OUT_HEADERS)/gps.utils \ - $(TARGET_OUT_HEADERS)/libloc_pla \ - $(TARGET_OUT_HEADERS)/liblocation_api - -LOCAL_COPY_HEADERS_TO:= libloc_core/ -LOCAL_COPY_HEADERS:= \ - LocApiBase.h \ - LocAdapterBase.h \ - ContextBase.h \ - LocDualContext.h \ - LBSProxyBase.h \ - UlpProxyBase.h \ - loc_core_log.h \ - LocAdapterProxyBase.h \ - SystemStatus.h +LOCAL_HEADER_LIBRARIES := \ + libgps.utils_headers \ + libloc_pla_headers \ + liblocation_api_headers include $(BUILD_SHARED_LIBRARY) +include $(CLEAR_VARS) +LOCAL_MODULE := libloc_core_headers +LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) +include $(BUILD_HEADER_LIBRARY) + endif # not BUILD_TINY_ANDROID endif # BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE diff --git a/gnss/Android.mk b/gnss/Android.mk index ea362087..9585b73b 100644 --- a/gnss/Android.mk +++ b/gnss/Android.mk @@ -30,11 +30,11 @@ ifeq ($(TARGET_BUILD_VARIANT),user) LOCAL_CFLAGS += -DTARGET_BUILD_VARIANT_USER endif -LOCAL_C_INCLUDES:= \ - $(TARGET_OUT_HEADERS)/gps.utils \ - $(TARGET_OUT_HEADERS)/libloc_core \ - $(TARGET_OUT_HEADERS)/libloc_pla \ - $(TARGET_OUT_HEADERS)/liblocation_api +LOCAL_HEADER_LIBRARIES := \ + libgps.utils_headers \ + libloc_core_headers \ + libloc_pla_headers \ + liblocation_api_headers LOCAL_PRELINK_MODULE := false diff --git a/location/Android.mk b/location/Android.mk index 6d2c9fa8..ad66aff9 100644 --- a/location/Android.mk +++ b/location/Android.mk @@ -24,18 +24,17 @@ LOCAL_SRC_FILES += \ LOCAL_CFLAGS += \ -fno-short-enums -LOCAL_C_INCLUDES:= \ - $(TARGET_OUT_HEADERS)/gps.utils - -LOCAL_COPY_HEADERS_TO:= liblocation_api/ -LOCAL_COPY_HEADERS:= \ - LocationAPI.h \ - LocationAPIClientBase.h \ - location_interface.h +LOCAL_HEADER_LIBRARIES := \ + libgps.utils_headers LOCAL_PRELINK_MODULE := false include $(BUILD_SHARED_LIBRARY) +include $(CLEAR_VARS) +LOCAL_MODULE := liblocation_api_headers +LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) +include $(BUILD_HEADER_LIBRARY) + endif # not BUILD_TINY_ANDROID endif # BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE diff --git a/utils/Android.mk b/utils/Android.mk index ef1e5e16..eeef2237 100644 --- a/utils/Android.mk +++ b/utils/Android.mk @@ -40,29 +40,9 @@ endif LOCAL_LDFLAGS += -Wl,--export-dynamic ## Includes -LOCAL_C_INCLUDES:= \ - $(TARGET_OUT_HEADERS)/libloc_pla \ - $(TARGET_OUT_HEADERS)/liblocation_api \ - -LOCAL_COPY_HEADERS_TO:= gps.utils/ -LOCAL_COPY_HEADERS:= \ - loc_log.h \ - loc_cfg.h \ - log_util.h \ - linked_list.h \ - msg_q.h \ - MsgTask.h \ - LocHeap.h \ - LocThread.h \ - LocTimer.h \ - loc_target.h \ - loc_timer.h \ - LocSharedLock.h \ - loc_misc_utils.h \ - loc_nmea.h \ - gps_extended_c.h \ - gps_extended.h \ - loc_gps.h +LOCAL_HEADER_LIBRARIES := \ + libloc_pla_headers \ + liblocation_api_headers LOCAL_MODULE := libgps.utils LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib @@ -73,6 +53,11 @@ LOCAL_PRELINK_MODULE := false include $(BUILD_SHARED_LIBRARY) +include $(CLEAR_VARS) +LOCAL_MODULE := libgps.utils_headers +LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) +include $(BUILD_HEADER_LIBRARY) + include $(addsuffix /Android.mk, $(addprefix $(LOCAL_PATH)/, platform_lib_abstractions)) endif # not BUILD_TINY_ANDROID endif # BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE diff --git a/utils/platform_lib_abstractions/loc_pla/src/Android.mk b/utils/platform_lib_abstractions/loc_pla/src/Android.mk index 7d321efa..98f25b3f 100644 --- a/utils/platform_lib_abstractions/loc_pla/src/Android.mk +++ b/utils/platform_lib_abstractions/loc_pla/src/Android.mk @@ -27,19 +27,10 @@ LOCAL_CFLAGS += \ ## Includes LOCAL_C_INCLUDES:= \ - $(LOCAL_PATH)/../include \ - $(TARGET_OUT_HEADERS)/gps.utils \ - $(TARGET_OUT_HEADERS)/libloc_stub - -LOCAL_COPY_HEADERS_TO:= libloc_pla/ -LOCAL_COPY_HEADERS:= \ - ../include/platform_lib_gettid.h \ - ../include/platform_lib_includes.h \ - ../include/platform_lib_log_util.h \ - ../include/platform_lib_macros.h \ - ../include/platform_lib_property_service.h \ - ../include/platform_lib_sched_policy.h \ - ../include/platform_lib_time.h + $(LOCAL_PATH)/../include +LOCAL_HEADER_LIBRARIES := \ + libgps.utils_headers \ + libloc_stub_headers LOCAL_MODULE := libloc_pla LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib @@ -49,5 +40,11 @@ LOCAL_MODULE_TAGS := optional LOCAL_PRELINK_MODULE := false include $(BUILD_SHARED_LIBRARY) + +include $(CLEAR_VARS) +LOCAL_MODULE := libloc_pla_headers +LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/../include +include $(BUILD_HEADER_LIBRARY) + endif # not BUILD_TINY_ANDROID endif # BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE diff --git a/utils/platform_lib_abstractions/loc_stub/src/Android.mk b/utils/platform_lib_abstractions/loc_stub/src/Android.mk index e899ca38..041ba643 100644 --- a/utils/platform_lib_abstractions/loc_stub/src/Android.mk +++ b/utils/platform_lib_abstractions/loc_stub/src/Android.mk @@ -31,15 +31,6 @@ LOCAL_LDFLAGS += -Wl,--export-dynamic LOCAL_C_INCLUDES:= \ $(LOCAL_PATH)/../include \ - -LOCAL_COPY_HEADERS_TO:= libloc_stub/ -LOCAL_COPY_HEADERS:= \ - ../include/loc_stub_android_runtime.h \ - ../include/loc_stub_gettid.h \ - ../include/loc_stub_property_service.h \ - ../include/loc_stub_sched_policy.h \ - ../include/loc_stub_time.h - LOCAL_MODULE := libloc_stub LOCAL_MODULE_PATH_32 := $(TARGET_OUT_VENDOR)/lib LOCAL_MODULE_PATH_64 := $(TARGET_OUT_VENDOR)/lib64 @@ -48,5 +39,11 @@ LOCAL_MODULE_TAGS := optional LOCAL_PRELINK_MODULE := false include $(BUILD_SHARED_LIBRARY) + +include $(CLEAR_VARS) +LOCAL_MODULE := libloc_stub_headers +LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/../include +include $(BUILD_HEADER_LIBRARY) + endif # not BUILD_TINY_ANDROID endif # BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE