commit 6ae7aad1713fa875ca971efcc3c851c8c6170c1b
author Steven Moreland <smoreland@google.com> Thu Aug 03 12:12:07 2017 -0700
committer Steven Moreland <smoreland@google.com> Thu Aug 03 23:02:46 2017 +0000
tree a1b94992db50eef9afe23b2d4dc9caf923c5b81f
parent dda5230e52bbf198433a6388ed5ede406f573921

Update makefiles (frameworks.jar).

Test: links at runtime and buildtime
Bug: 35771640
Change-Id: Ic7a71653d659115205e5bdbb782f73b774af0b29

usb/1.0/Android.mk

diff --git a/usb/1.0/Android.mk b/usb/1.0/Android.mk
index 62f6935..a293cc9 100644
--- a/usb/1.0/Android.mk
+++ b/usb/1.0/Android.mk
@@ -15,6 +15,8 @@
 LOCAL_JAVA_LIBRARIES := \
     android.hidl.base-V1.0-java \
 
+LOCAL_NO_STANDARD_LIBRARIES := true
+LOCAL_JAVA_LIBRARIES += core-oj hwbinder
 
 #
 # Build types.hal (PortDataRole)
@@ -208,6 +210,8 @@
 LOCAL_STATIC_JAVA_LIBRARIES := \
     android.hidl.base-V1.0-java-static \
 
+LOCAL_NO_STANDARD_LIBRARIES := true
+LOCAL_JAVA_LIBRARIES := core-oj hwbinder
 
 #
 # Build types.hal (PortDataRole)

usb/1.1/Android.mk

diff --git a/usb/1.1/Android.mk b/usb/1.1/Android.mk
index 12d306b..938390b 100644
--- a/usb/1.1/Android.mk
+++ b/usb/1.1/Android.mk
@@ -16,6 +16,8 @@
     android.hardware.usb-V1.0-java \
     android.hidl.base-V1.0-java \
 
+LOCAL_NO_STANDARD_LIBRARIES := true
+LOCAL_JAVA_LIBRARIES += core-oj hwbinder
 
 #
 # Build types.hal (PortMode_1_1)
@@ -111,6 +113,8 @@
     android.hardware.usb-V1.0-java-static \
     android.hidl.base-V1.0-java-static \
 
+LOCAL_NO_STANDARD_LIBRARIES := true
+LOCAL_JAVA_LIBRARIES := core-oj hwbinder
 
 #
 # Build types.hal (PortMode_1_1)