diff options
| author | Vijay Venkatraman <vijaykv@google.com> | 2017-02-16 15:35:58 -0800 |
|---|---|---|
| committer | firebird11 <hbgassel@gmail.com> | 2019-01-12 14:01:14 +0100 |
| commit | c559c58b392ff673236b14dd40753ff4e829fe59 (patch) | |
| tree | d854b6e2a4cdd6074a41d4c2ecbe06fdc09712a2 | |
| parent | 224a2777c467bd57b67683f6c034e910daa4058a (diff) | |
g3-common: gps: Replacing copy headers with header libraries
Bug: 33241851
Test: Build target and pass CTS location tests
Change-Id: I75db5e6de3c4194a6a46e0d37fcd899ea1d1db04
| -rw-r--r-- | gps/core/Android.mk | 19 | ||||
| -rw-r--r-- | gps/libloc_api_50001/Android.mk | 18 | ||||
| -rw-r--r-- | gps/utils/Android.mk | 19 |
3 files changed, 19 insertions, 37 deletions
diff --git a/gps/core/Android.mk b/gps/core/Android.mk index 466d86e..c599ce2 100644 --- a/gps/core/Android.mk +++ b/gps/core/Android.mk @@ -34,20 +34,13 @@ LOCAL_CFLAGS += \ LOCAL_C_INCLUDES:= \ $(TARGET_OUT_HEADERS)/gps.utils -LOCAL_COPY_HEADERS_TO:= libloc_core/ -LOCAL_COPY_HEADERS:= \ - MsgTask.h \ - LocApiBase.h \ - LocAdapterBase.h \ - ContextBase.h \ - LocDualContext.h \ - LBSProxyBase.h \ - UlpProxyBase.h \ - gps_extended_c.h \ - gps_extended.h \ - loc_core_log.h \ - LocAdapterProxyBase.h +LOCAL_HEADER_LIBRARIES := libgps.utils_headers LOCAL_PRELINK_MODULE := false include $(BUILD_SHARED_LIBRARY) + +include $(CLEAR_VARS) +LOCAL_MODULE := libloc_core_headers +LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) +include $(BUILD_HEADER_LIBRARY) diff --git a/gps/libloc_api_50001/Android.mk b/gps/libloc_api_50001/Android.mk index d84ee83..f8080b9 100644 --- a/gps/libloc_api_50001/Android.mk +++ b/gps/libloc_api_50001/Android.mk @@ -43,22 +43,18 @@ LOCAL_C_INCLUDES:= \ $(TARGET_OUT_HEADERS)/libloc_core \ $(LOCAL_PATH) -LOCAL_COPY_HEADERS_TO:= libloc_eng/ -LOCAL_COPY_HEADERS:= \ - LocEngAdapter.h \ - loc.h \ - loc_eng.h \ - loc_eng_xtra.h \ - loc_eng_ni.h \ - loc_eng_agps.h \ - loc_eng_msg.h \ - loc_eng_log.h +LOCAL_HEADER_LIBRARIES := libgps.utils_headers libloc_core_headers LOCAL_PRELINK_MODULE := false include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) +LOCAL_MODULE := libloc_eng_headers +LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) +include $(BUILD_HEADER_LIBRARY) + +include $(CLEAR_VARS) LOCAL_MODULE := gps.$(TARGET_BOARD_PLATFORM) LOCAL_MODULE_OWNER := qcom @@ -103,4 +99,6 @@ LOCAL_CFLAGS += \ LOCAL_PRELINK_MODULE := false LOCAL_MODULE_RELATIVE_PATH := hw +LOCAL_HEADER_LIBRARIES := libgps.utils_headers libloc_core_headers + include $(BUILD_SHARED_LIBRARY) diff --git a/gps/utils/Android.mk b/gps/utils/Android.mk index e70a0b6..2ec03ed 100644 --- a/gps/utils/Android.mk +++ b/gps/utils/Android.mk @@ -34,20 +34,6 @@ LOCAL_LDFLAGS += -Wl,--export-dynamic LOCAL_C_INCLUDES:= \ $(LOCAL_PATH)/../platform_lib_abstractions -LOCAL_COPY_HEADERS_TO:= gps.utils/ -LOCAL_COPY_HEADERS:= \ - loc_log.h \ - loc_cfg.h \ - log_util.h \ - linked_list.h \ - msg_q.h \ - loc_target.h \ - loc_timer.h \ - ../platform_lib_abstractions/platform_lib_includes.h \ - ../platform_lib_abstractions/platform_lib_time.h \ - ../platform_lib_abstractions/platform_lib_macros.h \ - loc_misc_utils.h - LOCAL_MODULE := libgps.utils LOCAL_MODULE_OWNER := qcom LOCAL_PROPRIETARY_MODULE := true @@ -57,3 +43,8 @@ LOCAL_MODULE_TAGS := optional LOCAL_PRELINK_MODULE := false include $(BUILD_SHARED_LIBRARY) + +include $(CLEAR_VARS) +LOCAL_MODULE := libgps.utils_headers +LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) $(LOCAL_PATH)/../platform_lib_abstractions +include $(BUILD_HEADER_LIBRARY) |