Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d8b5b083 authored by Mike Lockwood's avatar Mike Lockwood Committed by Android (Google) Code Review
Browse files

Merge "Change libusbhost and libmtp from static to shared libraries"

parents f268a527 da03aaad

media/jni/Android.mk

+7 −9
Original line number Diff line number Diff line
@@ -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 \

media/mtp/Android.mk

+3 −1
Original line number Diff line number Diff line
@@ -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

services/jni/Android.mk

+11 −12
Original line number Diff line number Diff line
@@ -25,9 +25,8 @@ LOCAL_SHARED_LIBRARIES := \ 
    libsystem_server \

    libutils \

    libui \

    libsurfaceflinger_client



LOCAL_STATIC_LIBRARIES := libusbhost

    libsurfaceflinger_client \

    libusbhost



ifeq ($(TARGET_SIMULATOR),true)

ifeq ($(TARGET_OS),linux)