From 6f286b270d2853bf44cb73964a9e79ba1c44c69e Mon Sep 17 00:00:00 2001 From: Badhri Jagan Sridharan Date: Fri, 5 May 2017 11:07:49 -0700 Subject: [PATCH] Prevent multiple copies of android.hidl.manager-V1.0-java Link to android.hidl.manager-V1.0-java shared library to prevent duplicate copies of the library present in process address space. Bug: 38036660 Test: Verified that the UsbService reports status of the ports through dumpsys usb. Change-Id: Ie3de4f9bbe28061e7cc464fa3cab2f6bd6fe6995 --- services/usb/Android.mk | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/services/usb/Android.mk b/services/usb/Android.mk index f6d212bccd1c3..57bf57d776ea1 100644 --- a/services/usb/Android.mk +++ b/services/usb/Android.mk @@ -7,8 +7,9 @@ LOCAL_MODULE := services.usb LOCAL_SRC_FILES += \ $(call all-java-files-under,java) -LOCAL_JAVA_LIBRARIES := services.core -LOCAL_STATIC_JAVA_LIBRARIES := android.hardware.usb-V1.0-java-static \ -android.hidl.manager-V1.0-java-static +LOCAL_JAVA_LIBRARIES := services.core \ +android.hidl.manager-V1.0-java + +LOCAL_STATIC_JAVA_LIBRARIES := android.hardware.usb-V1.0-java include $(BUILD_STATIC_JAVA_LIBRARY)