From 1e612befb31a3a4d8c24257392eaaa6557e66edc Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Thu, 15 Dec 2016 10:26:13 -0800 Subject: Depend on libandroid_runtime libloc_pla is playing tricks with -Wl,--export-dynamic to use symbols from libandroid_runtime without depending on it. libandroid_runtime's headers are moving to where they are only exported to modules that depend on it, so add a dependency and remove -Wl,--export-dynamic Bug: 33630870 Test: builds Change-Id: I9b0567a48ded63031085b6ba93fb3b36404279e1 (cherry picked from commit ada652709d5a1b9faedecc02739d2ed610e18f86) --- gps/utils/platform_lib_abstractions/loc_pla/src/Android.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gps') diff --git a/gps/utils/platform_lib_abstractions/loc_pla/src/Android.mk b/gps/utils/platform_lib_abstractions/loc_pla/src/Android.mk index 0363d59..1c15d56 100644 --- a/gps/utils/platform_lib_abstractions/loc_pla/src/Android.mk +++ b/gps/utils/platform_lib_abstractions/loc_pla/src/Android.mk @@ -10,7 +10,8 @@ LOCAL_SHARED_LIBRARIES := \ libutils \ libcutils \ liblog \ - libloc_stub + libloc_stub \ + libandroid_runtime LOCAL_SRC_FILES += \ platform_lib_android_runtime.cpp \ @@ -26,8 +27,6 @@ LOCAL_CFLAGS += \ -std=c++11 -LOCAL_LDFLAGS += -Wl,--export-dynamic - ## Includes LOCAL_C_INCLUDES:= \ $(LOCAL_PATH)/../include \ -- cgit v1.2.3