diff options
| -rw-r--r-- | media/jni/Android.mk | 16 | ||||
| -rw-r--r-- | media/mtp/Android.mk | 4 | ||||
| -rw-r--r-- | services/jni/Android.mk | 23 |
3 files changed, 21 insertions, 22 deletions
diff --git a/media/jni/Android.mk b/media/jni/Android.mk index fbdfa67..d3604b0 100644 --- a/media/jni/Android.mk +++ b/media/jni/Android.mk @@ -9,10 +9,10 @@ LOCAL_SRC_FILES:= \ android_media_ResampleInputStream.cpp \ android_media_MediaProfiles.cpp \ android_media_AmrInputStream.cpp \ - android_media_MtpDatabase.cpp \ - android_media_MtpServer.cpp \ - android_media_PtpClient.cpp \ - android_media_PtpCursor.cpp \ + android_media_MtpDatabase.cpp \ + android_media_MtpServer.cpp \ + android_media_PtpClient.cpp \ + android_media_PtpCursor.cpp \ LOCAL_SHARED_LIBRARIES := \ libandroid_runtime \ @@ -26,11 +26,9 @@ LOCAL_SHARED_LIBRARIES := \ libsurfaceflinger_client \ libstagefright \ libcamera_client \ - libsqlite - -ifneq ($(TARGET_SIMULATOR),true) -LOCAL_STATIC_LIBRARIES := libmtp libusbhost -endif + libsqlite \ + libmtp \ + libusbhost LOCAL_C_INCLUDES += \ external/tremor/Tremor \ diff --git a/media/mtp/Android.mk b/media/mtp/Android.mk index e285847..93e70e4 100644 --- a/media/mtp/Android.mk +++ b/media/mtp/Android.mk @@ -43,7 +43,9 @@ LOCAL_MODULE:= libmtp LOCAL_CFLAGS := -DMTP_DEVICE -DMTP_HOST -include $(BUILD_STATIC_LIBRARY) +LOCAL_SHARED_LIBRARIES := libutils libcutils libusbhost libbinder + +include $(BUILD_SHARED_LIBRARY) endif 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 |