diff options
| author | Bruno Martins <bgcngm@gmail.com> | 2016-11-16 23:40:24 +0000 |
|---|---|---|
| committer | davidevinavil <davidevinavil@gmail.com> | 2017-01-21 18:27:40 +0100 |
| commit | db17d990d994300016c7e88cecad7de81f5e79e5 (patch) | |
| tree | 8c1ec061f63ef1271b03bccc22fe945e6f6b6000 /gps/utils/Android.mk | |
| parent | b6b44db0293d2e81356ae8f35c2583f6129ea62c (diff) | |
z2_plus: Update GPS stack
* Tag LA.UM.5.5.r1-00100-8x96.0
Change-Id: I18cd979799001ccbaae6d08d07f907689ac5a00a
Diffstat (limited to 'gps/utils/Android.mk')
| -rw-r--r-- | gps/utils/Android.mk | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/gps/utils/Android.mk b/gps/utils/Android.mk index 103e524..ef1b7a2 100644 --- a/gps/utils/Android.mk +++ b/gps/utils/Android.mk @@ -5,11 +5,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 \ @@ -24,10 +26,10 @@ LOCAL_SRC_FILES += \ MsgTask.cpp \ loc_misc_utils.cpp +# Flag -std=c++11 is not accepted by compiler when LOCAL_CLANG is set to true LOCAL_CFLAGS += \ -fno-short-enums \ - -D_ANDROID_ \ - -std=c++11 + -D_ANDROID_ ifeq ($(TARGET_BUILD_VARIANT),user) LOCAL_CFLAGS += -DTARGET_BUILD_VARIANT_USER @@ -37,7 +39,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:= \ @@ -53,17 +55,15 @@ 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 -LOCAL_CLANG := false 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 |