diff options
author | Vijay Venkatraman <vijaykv@google.com> | 2017-03-14 23:16:28 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-03-14 23:16:28 +0000 |
commit | 762a0da8b09be9ba83d829d93006e4b74ed5b087 (patch) | |
tree | 40ae636a8c9104d38b441042750a7ac60d244f47 | |
parent | f61e72231a566483d798c8bf446a00c7d736d1a5 (diff) | |
parent | 92f4658882943b730e5244075d5227e724b24b48 (diff) | |
download | gps-762a0da8b09be9ba83d829d93006e4b74ed5b087.tar.gz |
Merge "Replacing copy headers with header libraries"
-rw-r--r-- | msm8996/core/Android.mk | 18 | ||||
-rw-r--r-- | msm8996/loc_api/libloc_api-rpc-50001/libloc_api-rpc-glue/Android.mk | 12 | ||||
-rw-r--r-- | msm8996/loc_api/libloc_api-rpc-50001/libloc_api-rpc-stub/Android.mk | 11 | ||||
-rw-r--r-- | msm8996/loc_api/libloc_api_50001/Android.mk | 18 | ||||
-rw-r--r-- | msm8996/utils/Android.mk | 24 |
5 files changed, 30 insertions, 53 deletions
diff --git a/msm8996/core/Android.mk b/msm8996/core/Android.mk index 60c7b31..fac5092 100644 --- a/msm8996/core/Android.mk +++ b/msm8996/core/Android.mk @@ -39,22 +39,16 @@ LOCAL_CFLAGS += \ LOCAL_C_INCLUDES:= \ $(TARGET_OUT_HEADERS)/gps.utils -LOCAL_COPY_HEADERS_TO:= libloc_core/ -LOCAL_COPY_HEADERS:= \ - 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) + endif # not BUILD_TINY_ANDROID endif # BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE diff --git a/msm8996/loc_api/libloc_api-rpc-50001/libloc_api-rpc-glue/Android.mk b/msm8996/loc_api/libloc_api-rpc-50001/libloc_api-rpc-glue/Android.mk index 6e50c8d..70d3e85 100644 --- a/msm8996/loc_api/libloc_api-rpc-50001/libloc_api-rpc-glue/Android.mk +++ b/msm8996/loc_api/libloc_api-rpc-50001/libloc_api-rpc-glue/Android.mk @@ -44,13 +44,6 @@ LOCAL_C_INCLUDES:= \ $(TARGET_OUT_HEADERS)/libloc-rpc/rpc_inc \ $(TOP)/hardware/msm7k/librpc -LOCAL_COPY_HEADERS_TO:= libloc_api-rpc-qc/$(RPC_INC) -LOCAL_COPY_HEADERS:= \ - $(RPC_INC)/loc_api_rpc_glue.h \ - $(RPC_INC)/loc_api_fixup.h \ - $(RPC_INC)/loc_api_sync_call.h \ - $(RPC_INC)/loc_apicb_appinit.h \ - $(RPC_INC)/LocApiRpc.h LOCAL_MODULE:= libloc_api-rpc-qc LOCAL_MODULE_OWNER := qcom @@ -59,3 +52,8 @@ LOCAL_MODULE_TAGS := optional LOCAL_PROPRIETARY_MODULE := true include $(BUILD_SHARED_LIBRARY) + +include $(CLEAR_VARS) +LOCAL_MODULE := libloc_api-rpc-qc_headers +LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH/$(RPC_INC)) +include $(BUILD_HEADER_LIBRARY) diff --git a/msm8996/loc_api/libloc_api-rpc-50001/libloc_api-rpc-stub/Android.mk b/msm8996/loc_api/libloc_api-rpc-50001/libloc_api-rpc-stub/Android.mk index c0987e6..1c2b16b 100644 --- a/msm8996/loc_api/libloc_api-rpc-50001/libloc_api-rpc-stub/Android.mk +++ b/msm8996/loc_api/libloc_api-rpc-50001/libloc_api-rpc-stub/Android.mk @@ -25,12 +25,11 @@ LOCAL_C_INCLUDES += $(LOC_RPCGEN_APIS_PATH)/../../SHARED_LIBRARIES/libcommondefs LOCAL_C_INCLUDES += $(LOCAL_PATH)/inc LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/libcommondefs/rpcgen/inc -LOCAL_COPY_HEADERS_TO := loc_api/rpcgen/inc -LOCAL_COPY_HEADERS := inc/loc_api_rpcgen_rpc.h -LOCAL_COPY_HEADERS += inc/loc_api_rpcgen_common_rpc.h -LOCAL_COPY_HEADERS += inc/loc_api_rpcgen_cb_rpc.h -LOCAL_COPY_HEADERS += inc/loc_apicb_appinit.h - LOCAL_LDLIBS += -lpthread LOCAL_PRELINK_MODULE := false include $(BUILD_STATIC_LIBRARY) + +include $(CLEAR_VARS) +LOCAL_MODULE := libloc_api_rpcgen_headers +LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/inc +include $(BUILD_HEADER_LIBRARY) diff --git a/msm8996/loc_api/libloc_api_50001/Android.mk b/msm8996/loc_api/libloc_api_50001/Android.mk index 70301db..5182318 100644 --- a/msm8996/loc_api/libloc_api_50001/Android.mk +++ b/msm8996/loc_api/libloc_api_50001/Android.mk @@ -46,22 +46,18 @@ LOCAL_C_INCLUDES:= \ hardware/qcom/gps/msm8996/loc_api/libloc_api_50001 \ $(TARGET_OUT_HEADERS)/libflp -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.$(BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE) LOCAL_MODULE_OWNER := qcom @@ -108,6 +104,8 @@ LOCAL_C_INCLUDES:= \ LOCAL_PRELINK_MODULE := false LOCAL_MODULE_RELATIVE_PATH := hw +LOCAL_HEADER_LIBRARIES := libgps.utils_headers libloc_core_headers + include $(BUILD_SHARED_LIBRARY) endif # not BUILD_TINY_ANDROID diff --git a/msm8996/utils/Android.mk b/msm8996/utils/Android.mk index 5055712..a322d0f 100644 --- a/msm8996/utils/Android.mk +++ b/msm8996/utils/Android.mk @@ -39,24 +39,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 \ - MsgTask.h \ - LocHeap.h \ - LocThread.h \ - LocTimer.h \ - loc_target.h \ - loc_timer.h \ - LocSharedLock.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 @@ -69,5 +51,11 @@ LOCAL_PROPRIETARY_MODULE := true 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) + endif # not BUILD_TINY_ANDROID endif # BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE |