Update for Soong java makefiles.
Test: pass
Bug: 33420795
Change-Id: Id9b1919a19b8ff682738cfb0869a479b4dbb4293
diff --git a/usb/1.0/Android.bp b/usb/1.0/Android.bp
index ce4bc25..f733e36 100644
--- a/usb/1.0/Android.bp
+++ b/usb/1.0/Android.bp
@@ -73,6 +73,56 @@
}
genrule {
+ name: "android.hardware.usb-V1.0-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.0",
+ srcs: [
+ ":android.hardware.usb@1.0_hal",
+ ],
+ out: [
+ "android/hardware/usb/V1_0/PortDataRole.java",
+ "android/hardware/usb/V1_0/PortMode.java",
+ "android/hardware/usb/V1_0/PortPowerRole.java",
+ "android/hardware/usb/V1_0/PortRole.java",
+ "android/hardware/usb/V1_0/PortRoleType.java",
+ "android/hardware/usb/V1_0/PortStatus.java",
+ "android/hardware/usb/V1_0/Status.java",
+ "android/hardware/usb/V1_0/IUsb.java",
+ "android/hardware/usb/V1_0/IUsbCallback.java",
+ ],
+}
+
+java_library {
+ name: "android.hardware.usb-V1.0-java",
+ no_framework_libs: true,
+ defaults: ["hidl-java-module-defaults"],
+ srcs: [":android.hardware.usb-V1.0-java_gen_java"],
+ libs: [
+ "hwbinder",
+ "android.hidl.base-V1.0-java",
+ ]
+}
+
+genrule {
+ name: "android.hardware.usb-V1.0-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.0",
+ srcs: [
+ ":android.hardware.usb@1.0_hal",
+ ],
+ out: [
+ "android/hardware/usb/V1_0/Constants.java",
+ ],
+}
+
+java_library {
+ name: "android.hardware.usb-V1.0-java-constants",
+ no_framework_libs: true,
+ defaults: ["hidl-java-module-defaults"],
+ srcs: [":android.hardware.usb-V1.0-java-constants_gen_java"],
+}
+
+genrule {
name: "android.hardware.usb@1.0-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.0",
@@ -98,7 +148,6 @@
],
}
-
cc_library {
name: "android.hardware.usb@1.0-adapter-helper",
defaults: ["hidl-module-defaults"],