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

Commit 15f6c205 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Prevent multiple copies of android.hidl.manager-V1.0-java"

parents e1a8dfff e5bf8265
Loading
Loading
Loading
Loading
+5 −4
Original line number Diff line number Diff line
@@ -7,9 +7,10 @@ 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.hardware.usb-V1.1-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 \
android.hardware.usb-V1.1-java

include $(BUILD_STATIC_JAVA_LIBRARY)