summaryrefslogtreecommitdiffstats
path: root/services/jni
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@android.com>2010-12-29 08:32:32 -0500
committerMike Lockwood <lockwood@android.com>2010-12-29 09:12:15 -0500
commitda03aaad78c124be8903c2c4029ecd329b250f4c (patch)
tree7e585569922300f8c32c7fb769ed3b7fb3ea5e6a /services/jni
parent4887804ea619dd98ccb52a1cd911d23c74b4b457 (diff)
downloadframeworks_base-da03aaad78c124be8903c2c4029ecd329b250f4c.zip
frameworks_base-da03aaad78c124be8903c2c4029ecd329b250f4c.tar.gz
frameworks_base-da03aaad78c124be8903c2c4029ecd329b250f4c.tar.bz2
Change libusbhost and libmtp from static to shared libraries
Change-Id: Iccc67db32400cdeb88aa33261c9e0cf73db992ca Signed-off-by: Mike Lockwood <lockwood@android.com>
Diffstat (limited to 'services/jni')
-rw-r--r--services/jni/Android.mk23
1 files changed, 11 insertions, 12 deletions
diff --git a/services/jni/Android.mk b/services/jni/Android.mk
index 89ead82..845869c 100644
--- a/services/jni/Android.mk
+++ b/services/jni/Android.mk
@@ -10,24 +10,23 @@ LOCAL_SRC_FILES:= \
com_android_server_SystemServer.cpp \
com_android_server_UsbService.cpp \
com_android_server_VibratorService.cpp \
- com_android_server_location_GpsLocationProvider.cpp \
+ com_android_server_location_GpsLocationProvider.cpp \
onload.cpp
LOCAL_C_INCLUDES += \
- $(JNI_H_INCLUDE)
+ $(JNI_H_INCLUDE)
LOCAL_SHARED_LIBRARIES := \
libandroid_runtime \
- libcutils \
- libhardware \
- libhardware_legacy \
- libnativehelper \
+ libcutils \
+ libhardware \
+ libhardware_legacy \
+ libnativehelper \
libsystem_server \
- libutils \
- libui \
- libsurfaceflinger_client
-
-LOCAL_STATIC_LIBRARIES := libusbhost
+ libutils \
+ libui \
+ libsurfaceflinger_client \
+ libusbhost
ifeq ($(TARGET_SIMULATOR),true)
ifeq ($(TARGET_OS),linux)
@@ -38,7 +37,7 @@ endif
endif
ifeq ($(WITH_MALLOC_LEAK_CHECK),true)
- LOCAL_CFLAGS += -DMALLOC_LEAK_CHECK
+ LOCAL_CFLAGS += -DMALLOC_LEAK_CHECK
endif
LOCAL_MODULE:= libandroid_servers