Update makefiles for hidl_interface.
Bug: 35570956
Test: manual
Change-Id: I7a220b78ee081240e1dc30ef5672ba39e3e98375
diff --git a/usb/1.0/Android.bp b/usb/1.0/Android.bp
index f733e36..6676fa5 100644
--- a/usb/1.0/Android.bp
+++ b/usb/1.0/Android.bp
@@ -1,199 +1,29 @@
-// This file is autogenerated by hidl-gen. Do not edit manually.
+// This file is autogenerated by hidl-gen -Landroidbp.
-filegroup {
- name: "android.hardware.usb@1.0_hal",
+hidl_interface {
+ name: "android.hardware.usb@1.0",
+ root: "android.hardware",
+ vndk: {
+ enabled: true,
+ },
srcs: [
"types.hal",
"IUsb.hal",
"IUsbCallback.hal",
],
+ interfaces: [
+ "android.hidl.base@1.0",
+ ],
+ types: [
+ "PortDataRole",
+ "PortMode",
+ "PortPowerRole",
+ "PortRole",
+ "PortRoleType",
+ "PortStatus",
+ "Status",
+ ],
+ gen_java: true,
+ gen_java_constants: true,
}
-genrule {
- name: "android.hardware.usb@1.0_genc++",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -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/1.0/types.cpp",
- "android/hardware/usb/1.0/UsbAll.cpp",
- "android/hardware/usb/1.0/UsbCallbackAll.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.usb@1.0_genc++_headers",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -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/1.0/types.h",
- "android/hardware/usb/1.0/hwtypes.h",
- "android/hardware/usb/1.0/IUsb.h",
- "android/hardware/usb/1.0/IHwUsb.h",
- "android/hardware/usb/1.0/BnHwUsb.h",
- "android/hardware/usb/1.0/BpHwUsb.h",
- "android/hardware/usb/1.0/BsUsb.h",
- "android/hardware/usb/1.0/IUsbCallback.h",
- "android/hardware/usb/1.0/IHwUsbCallback.h",
- "android/hardware/usb/1.0/BnHwUsbCallback.h",
- "android/hardware/usb/1.0/BpHwUsbCallback.h",
- "android/hardware/usb/1.0/BsUsbCallback.h",
- ],
-}
-
-cc_library {
- name: "android.hardware.usb@1.0",
- defaults: ["hidl-module-defaults"],
- generated_sources: ["android.hardware.usb@1.0_genc++"],
- generated_headers: ["android.hardware.usb@1.0_genc++_headers"],
- export_generated_headers: ["android.hardware.usb@1.0_genc++_headers"],
- vendor_available: true,
- vndk: {
- enabled: true,
- },
- shared_libs: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "liblog",
- "libutils",
- "libcutils",
- ],
- export_shared_lib_headers: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "libutils",
- ],
-}
-
-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",
- srcs: [
- ":android.hardware.usb@1.0_hal",
- ],
- out: [
- "android/hardware/usb/1.0/AUsb.cpp",
- "android/hardware/usb/1.0/AUsbCallback.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.usb@1.0-adapter-helper_genc++_headers",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-headers -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/1.0/AUsb.h",
- "android/hardware/usb/1.0/AUsbCallback.h",
- ],
-}
-
-cc_library {
- name: "android.hardware.usb@1.0-adapter-helper",
- defaults: ["hidl-module-defaults"],
- generated_sources: ["android.hardware.usb@1.0-adapter-helper_genc++"],
- generated_headers: ["android.hardware.usb@1.0-adapter-helper_genc++_headers"],
- export_generated_headers: ["android.hardware.usb@1.0-adapter-helper_genc++_headers"],
- vendor_available: true,
- shared_libs: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "liblog",
- "libutils",
- "libcutils",
- "libhidladapter",
- "android.hardware.usb@1.0",
- "android.hidl.base@1.0-adapter-helper",
- ],
- export_shared_lib_headers: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "libutils",
- "libhidladapter",
- "android.hardware.usb@1.0",
- "android.hidl.base@1.0-adapter-helper",
- ],
-}
-
-genrule {
- name: "android.hardware.usb@1.0-adapter_genc++",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.usb@1.0",
- out: ["main.cpp"]
-}
-
-cc_test {
- name: "android.hardware.usb@1.0-adapter",
- defaults: ["hidl-module-defaults"],
- shared_libs: [
- "libhidladapter",
- "libhidlbase",
- "libhidltransport",
- "libutils",
- "android.hardware.usb@1.0",
- "android.hardware.usb@1.0-adapter-helper",
- ],
- generated_sources: ["android.hardware.usb@1.0-adapter_genc++"],
-}
diff --git a/usb/1.1/Android.bp b/usb/1.1/Android.bp
index 67bc0a6..c398f94 100644
--- a/usb/1.1/Android.bp
+++ b/usb/1.1/Android.bp
@@ -1,202 +1,25 @@
-// This file is autogenerated by hidl-gen. Do not edit manually.
+// This file is autogenerated by hidl-gen -Landroidbp.
-filegroup {
- name: "android.hardware.usb@1.1_hal",
+hidl_interface {
+ name: "android.hardware.usb@1.1",
+ root: "android.hardware",
+ vndk: {
+ enabled: true,
+ },
srcs: [
"types.hal",
"IUsb.hal",
"IUsbCallback.hal",
],
-}
-
-genrule {
- name: "android.hardware.usb@1.1_genc++",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -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/1.1/types.cpp",
- "android/hardware/usb/1.1/UsbAll.cpp",
- "android/hardware/usb/1.1/UsbCallbackAll.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.usb@1.1_genc++_headers",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -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/1.1/types.h",
- "android/hardware/usb/1.1/hwtypes.h",
- "android/hardware/usb/1.1/IUsb.h",
- "android/hardware/usb/1.1/IHwUsb.h",
- "android/hardware/usb/1.1/BnHwUsb.h",
- "android/hardware/usb/1.1/BpHwUsb.h",
- "android/hardware/usb/1.1/BsUsb.h",
- "android/hardware/usb/1.1/IUsbCallback.h",
- "android/hardware/usb/1.1/IHwUsbCallback.h",
- "android/hardware/usb/1.1/BnHwUsbCallback.h",
- "android/hardware/usb/1.1/BpHwUsbCallback.h",
- "android/hardware/usb/1.1/BsUsbCallback.h",
- ],
-}
-
-cc_library {
- name: "android.hardware.usb@1.1",
- defaults: ["hidl-module-defaults"],
- generated_sources: ["android.hardware.usb@1.1_genc++"],
- generated_headers: ["android.hardware.usb@1.1_genc++_headers"],
- export_generated_headers: ["android.hardware.usb@1.1_genc++_headers"],
- vendor_available: true,
- vndk: {
- enabled: true,
- },
- shared_libs: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "liblog",
- "libutils",
- "libcutils",
+ interfaces: [
"android.hardware.usb@1.0",
+ "android.hidl.base@1.0",
],
- export_shared_lib_headers: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "libutils",
- "android.hardware.usb@1.0",
+ types: [
+ "PortMode_1_1",
+ "PortStatus_1_1",
],
+ gen_java: true,
+ gen_java_constants: true,
}
-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",
- srcs: [
- ":android.hardware.usb@1.1_hal",
- ],
- out: [
- "android/hardware/usb/1.1/AUsb.cpp",
- "android/hardware/usb/1.1/AUsbCallback.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.usb@1.1-adapter-helper_genc++_headers",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-headers -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/1.1/AUsb.h",
- "android/hardware/usb/1.1/AUsbCallback.h",
- ],
-}
-
-cc_library {
- name: "android.hardware.usb@1.1-adapter-helper",
- defaults: ["hidl-module-defaults"],
- generated_sources: ["android.hardware.usb@1.1-adapter-helper_genc++"],
- generated_headers: ["android.hardware.usb@1.1-adapter-helper_genc++_headers"],
- export_generated_headers: ["android.hardware.usb@1.1-adapter-helper_genc++_headers"],
- vendor_available: true,
- shared_libs: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "liblog",
- "libutils",
- "libcutils",
- "libhidladapter",
- "android.hardware.usb@1.0",
- "android.hardware.usb@1.1",
- "android.hardware.usb@1.0-adapter-helper",
- "android.hidl.base@1.0-adapter-helper",
- ],
- export_shared_lib_headers: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "libutils",
- "libhidladapter",
- "android.hardware.usb@1.0",
- "android.hardware.usb@1.1",
- "android.hardware.usb@1.0-adapter-helper",
- "android.hidl.base@1.0-adapter-helper",
- ],
-}
-
-genrule {
- name: "android.hardware.usb@1.1-adapter_genc++",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.usb@1.1",
- out: ["main.cpp"]
-}
-
-cc_test {
- name: "android.hardware.usb@1.1-adapter",
- defaults: ["hidl-module-defaults"],
- shared_libs: [
- "libhidladapter",
- "libhidlbase",
- "libhidltransport",
- "libutils",
- "android.hardware.usb@1.0",
- "android.hardware.usb@1.1",
- "android.hardware.usb@1.1-adapter-helper",
- ],
- generated_sources: ["android.hardware.usb@1.1-adapter_genc++"],
-}