commit 9f8ad0824da8c1e4a2095af88e8242313e13caaa
author Steve Kondik <shade@chemlab.org> Mon Nov 21 22:59:44 2011 -0800
committer Steve Kondik <shade@chemlab.org> Mon Nov 21 22:59:44 2011 -0800
tree c30a290dcfb154063d85e8d26970e81ed8ad7d7c
parent 015f4e275bb9aca9daad79898224202d2c07b7a3
parent 13598000cefe59c5409a5bfb939cfd2c914a2d97

Merge branch 'gingerbread' of git://github.com/CyanogenMod/android_hardware_qcom_gps into HEAD

Conflicts:
	loc_api/libloc_api-rpc/Android.mk

Change-Id: I168e74f56112358932560ce051cd341aa1b2d295

loc_api/libloc_api-rpc/Android.mk

diff --git a/loc_api/libloc_api-rpc/Android.mk b/loc_api/libloc_api-rpc/Android.mk
index 2ce9bac..55949ae 100755
--- a/loc_api/libloc_api-rpc/Android.mk
+++ b/loc_api/libloc_api-rpc/Android.mk
@@ -40,7 +40,7 @@
 LOCAL_SHARED_LIBRARIES:= librpc
 LOCAL_STATIC_LIBRARIES:= libcommondefs-rpc
 
-LOCAL_PRELINK_MODULE:= false
+
 
 LOCAL_COPY_HEADERS_TO:= libloc_api-rpc/inc
 LOCAL_COPY_HEADERS:= \

loc_api/libloc_api/Android.mk

diff --git a/loc_api/libloc_api/Android.mk b/loc_api/libloc_api/Android.mk
index 4def3c6..b1f3dfb 100644
--- a/loc_api/libloc_api/Android.mk
+++ b/loc_api/libloc_api/Android.mk
@@ -13,7 +13,7 @@
 LOCAL_MODULE_TAGS := optional
 
 LOCAL_MODULE := gps.$(BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE)
-
+LOCAL_MODULE_TAGS := optional
 LOCAL_STATIC_LIBRARIES:= \
     libloc_api-rpc 
 
@@ -52,7 +52,7 @@
 	$(TARGET_OUT_HEADERS)/libcommondefs-rpc/inc \
 	$(TARGET_OUT_HEADERS)/librpc
 
-LOCAL_PRELINK_MODULE := false
+
 LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
 
 LOCAL_MODULE_TAGS := optional