summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenis 'GNUtoo' Carikli <GNUtoo@no-log.org>2011-01-06 23:38:44 +0100
committerDenis 'GNUtoo' Carikli <GNUtoo@no-log.org>2011-01-07 01:03:59 +0100
commitc6bf87d75456e2ade54acf79beff0d2045466a24 (patch)
tree3ad9d4a5ad281635c2b59f7e1d098f6d7222af02
parent1218f1fefdd5fee8b066df4bb3d165d64218ab3a (diff)
downloadframeworks_base-c6bf87d75456e2ade54acf79beff0d2045466a24.zip
frameworks_base-c6bf87d75456e2ade54acf79beff0d2045466a24.tar.gz
frameworks_base-c6bf87d75456e2ade54acf79beff0d2045466a24.tar.bz2
core/jni/Android.mk: conditionally link to libloc_api
if we don't link to libloc_api when the gps libraries are the libloc_api libraries and not the gpslib, the result is the following: undefined reference to `gps_get_interface' Note that the libloc api were previously modified from gps_get_hardware_interface to gps_get_interface to make them work. Change-Id: I0da6f449b1cc3f1d5514b983c8e5e1709aedc02b Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>
-rw-r--r--core/jni/Android.mk5
1 files changed, 5 insertions, 0 deletions
diff --git a/core/jni/Android.mk b/core/jni/Android.mk
index ac188b8..7560bf2 100644
--- a/core/jni/Android.mk
+++ b/core/jni/Android.mk
@@ -192,6 +192,11 @@ LOCAL_SHARED_LIBRARIES := \
libwpa_client \
libjpeg
+ifeq ($(BOARD_GPS_LIBRARIES),libloc_api)
+ LOCAL_SHARED_LIBRARIES += \
+ libloc_api
+endif
+
ifneq ($(BOARD_USES_ECLAIR_LIBCAMERA),true)
LOCAL_SHARED_LIBRARIES += \
libsurfaceflinger_client \