diff options
| author | Naresh Munagala <nareshm@codeaurora.org> | 2016-03-23 21:54:12 +0530 |
|---|---|---|
| committer | Kevin Tang <zhikait@codeaurora.org> | 2016-04-06 09:48:43 -0700 |
| commit | 8f54f693ee413e3716ae4d18a67282404e4df4f7 (patch) | |
| tree | 15a26e3054b98b3510ef86f73dc38675a08bde21 /utils/Android.mk | |
| parent | 1fbe5b2ff453d51a347d7e9b2f2f6bc7b78bc32c (diff) | |
| download | gps-8f54f693ee413e3716ae4d18a67282404e4df4f7.tar.gz | |
Fix LA compilation issues after merge
Fixed compilation issues for LA after merging
oe_master with location.lnx.1.0-dev.1.0.
Change-Id: I7940429c369249ab9aa636fe9850c1281cf2dc01
CRs-Fixed: 995520
Diffstat (limited to 'utils/Android.mk')
| -rw-r--r-- | utils/Android.mk | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/utils/Android.mk b/utils/Android.mk index 240d11f..45f3c25 100644 --- a/utils/Android.mk +++ b/utils/Android.mk @@ -6,11 +6,13 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) + ## Libs LOCAL_SHARED_LIBRARIES := \ libutils \ libcutils \ - liblog + liblog \ + libloc_pla LOCAL_SRC_FILES += \ loc_log.cpp \ @@ -38,7 +40,7 @@ LOCAL_LDFLAGS += -Wl,--export-dynamic ## Includes LOCAL_C_INCLUDES:= \ - $(LOCAL_PATH)/platform_lib_abstractions + $(TARGET_OUT_HEADERS)/libloc_pla LOCAL_COPY_HEADERS_TO:= gps.utils/ LOCAL_COPY_HEADERS:= \ @@ -54,9 +56,6 @@ LOCAL_COPY_HEADERS:= \ 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 @@ -66,5 +65,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_PRELINK_MODULE := false include $(BUILD_SHARED_LIBRARY) + +include $(addsuffix /Android.mk, $(addprefix $(LOCAL_PATH)/, platform_lib_abstractions)) endif # not BUILD_TINY_ANDROID endif # BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE |