commit f390f03aa41691939f95729f3989feac03ee2f83
author Steven Moreland <smoreland@google.com> Wed Oct 11 11:09:24 2017 -0700
committer Steven Moreland <smoreland@google.com> Wed Oct 11 18:30:28 2017 +0000
tree bf28d1fe284968d4aeccd2148a260b02e2539fd9
parent 1d7374c5e168c825b75185af53c77f4eae9eea2c

Update for Soong-only makefiles.

Test: pass
Bug: 33420795
Change-Id: Ibec6d1e38939b9e7566a96381439be2aac3bf8ca

usb/1.1/Android.bp

diff --git a/usb/1.1/Android.bp b/usb/1.1/Android.bp
index c6c2034..67bc0a6 100644
--- a/usb/1.1/Android.bp
+++ b/usb/1.1/Android.bp
@@ -75,6 +75,52 @@
 }
 
 genrule {
+    name: "android.hardware.usb-V1.1-java_gen_java",
+    tools: ["hidl-gen"],
+    cmd: "$(location hidl-gen) -o $(genDir) -Ljava -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.usb@1.1",
+    srcs: [
+        ":android.hardware.usb@1.1_hal",
+    ],
+    out: [
+        "android/hardware/usb/V1_1/PortMode_1_1.java",
+        "android/hardware/usb/V1_1/PortStatus_1_1.java",
+        "android/hardware/usb/V1_1/IUsb.java",
+        "android/hardware/usb/V1_1/IUsbCallback.java",
+    ],
+}
+
+java_library {
+    name: "android.hardware.usb-V1.1-java",
+    no_framework_libs: true,
+    defaults: ["hidl-java-module-defaults"],
+    srcs: [":android.hardware.usb-V1.1-java_gen_java"],
+    libs: [
+        "hwbinder",
+        "android.hardware.usb-V1.0-java",
+        "android.hidl.base-V1.0-java",
+    ]
+}
+
+genrule {
+    name: "android.hardware.usb-V1.1-java-constants_gen_java",
+    tools: ["hidl-gen"],
+    cmd: "$(location hidl-gen) -o $(genDir) -Ljava-constants -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.usb@1.1",
+    srcs: [
+        ":android.hardware.usb@1.1_hal",
+    ],
+    out: [
+        "android/hardware/usb/V1_1/Constants.java",
+    ],
+}
+
+java_library {
+    name: "android.hardware.usb-V1.1-java-constants",
+    no_framework_libs: true,
+    defaults: ["hidl-java-module-defaults"],
+    srcs: [":android.hardware.usb-V1.1-java-constants_gen_java"],
+}
+
+genrule {
     name: "android.hardware.usb@1.1-adapter-helper_genc++",
     tools: ["hidl-gen"],
     cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.usb@1.1",
@@ -100,7 +146,6 @@
     ],
 }
 
-
 cc_library {
     name: "android.hardware.usb@1.1-adapter-helper",
     defaults: ["hidl-module-defaults"],
@@ -143,6 +188,7 @@
 
 cc_test {
     name: "android.hardware.usb@1.1-adapter",
+    defaults: ["hidl-module-defaults"],
     shared_libs: [
         "libhidladapter",
         "libhidlbase",