Updating makefiles for hidl_interface.
Bug: 64487114
Test: manual
Merged-In: Ie13d9e014cf2b81c18c67f551b4644fb9f0ba812
Change-Id: Ie13d9e014cf2b81c18c67f551b4644fb9f0ba812
diff --git a/automotive/vehicle/2.0/Android.bp b/automotive/vehicle/2.0/Android.bp
index 10f99b1..7ab2387 100644
--- a/automotive/vehicle/2.0/Android.bp
+++ b/automotive/vehicle/2.0/Android.bp
@@ -1,240 +1,87 @@
-// This file is autogenerated by hidl-gen. Do not edit manually.
+// This file is autogenerated by hidl-gen -Landroidbp.
-filegroup {
- name: "android.hardware.automotive.vehicle@2.0_hal",
+hidl_interface {
+ name: "android.hardware.automotive.vehicle@2.0",
+ root: "android.hardware",
+ vndk: {
+ enabled: true,
+ },
srcs: [
"types.hal",
"IVehicle.hal",
"IVehicleCallback.hal",
],
+ interfaces: [
+ "android.hidl.base@1.0",
+ ],
+ types: [
+ "DiagnosticFloatSensorIndex",
+ "DiagnosticIntegerSensorIndex",
+ "EvConnectorType",
+ "FuelType",
+ "Obd2CommonIgnitionMonitors",
+ "Obd2CompressionIgnitionMonitors",
+ "Obd2FuelSystemStatus",
+ "Obd2FuelType",
+ "Obd2IgnitionMonitorKind",
+ "Obd2SecondaryAirStatus",
+ "Obd2SparkIgnitionMonitors",
+ "StatusCode",
+ "SubscribeFlags",
+ "SubscribeOptions",
+ "VehicleApPowerBootupReason",
+ "VehicleApPowerSetState",
+ "VehicleApPowerState",
+ "VehicleApPowerStateConfigFlag",
+ "VehicleApPowerStateIndex",
+ "VehicleApPowerStateShutdownParam",
+ "VehicleArea",
+ "VehicleAreaConfig",
+ "VehicleAreaDoor",
+ "VehicleAreaMirror",
+ "VehicleAreaSeat",
+ "VehicleAreaWindow",
+ "VehicleAreaZone",
+ "VehicleAudioContextFlag",
+ "VehicleAudioExtFocusFlag",
+ "VehicleAudioFocusIndex",
+ "VehicleAudioFocusRequest",
+ "VehicleAudioFocusState",
+ "VehicleAudioHwVariantConfigFlag",
+ "VehicleAudioRoutingPolicyIndex",
+ "VehicleAudioStream",
+ "VehicleAudioStreamFlag",
+ "VehicleAudioVolumeCapabilityFlag",
+ "VehicleAudioVolumeIndex",
+ "VehicleAudioVolumeLimitIndex",
+ "VehicleAudioVolumeState",
+ "VehicleDisplay",
+ "VehicleDrivingStatus",
+ "VehicleGear",
+ "VehicleHvacFanDirection",
+ "VehicleHwKeyInputAction",
+ "VehicleIgnitionState",
+ "VehicleInstrumentClusterType",
+ "VehiclePropConfig",
+ "VehiclePropValue",
+ "VehicleProperty",
+ "VehiclePropertyAccess",
+ "VehiclePropertyChangeMode",
+ "VehiclePropertyGroup",
+ "VehiclePropertyOperation",
+ "VehiclePropertyType",
+ "VehicleRadioConstants",
+ "VehicleTurnSignal",
+ "VehicleUnit",
+ "VmsAvailabilityStateIntegerValuesIndex",
+ "VmsBaseMessageIntegerValuesIndex",
+ "VmsMessageType",
+ "VmsMessageWithLayerAndPublisherIdIntegerValuesIndex",
+ "VmsMessageWithLayerIntegerValuesIndex",
+ "VmsOfferingMessageIntegerValuesIndex",
+ "VmsSubscriptionsStateIntegerValuesIndex",
+ "Wheel",
+ ],
+ gen_java: true,
}
-genrule {
- name: "android.hardware.automotive.vehicle@2.0_genc++",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.automotive.vehicle@2.0",
- srcs: [
- ":android.hardware.automotive.vehicle@2.0_hal",
- ],
- out: [
- "android/hardware/automotive/vehicle/2.0/types.cpp",
- "android/hardware/automotive/vehicle/2.0/VehicleAll.cpp",
- "android/hardware/automotive/vehicle/2.0/VehicleCallbackAll.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.automotive.vehicle@2.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.automotive.vehicle@2.0",
- srcs: [
- ":android.hardware.automotive.vehicle@2.0_hal",
- ],
- out: [
- "android/hardware/automotive/vehicle/2.0/types.h",
- "android/hardware/automotive/vehicle/2.0/hwtypes.h",
- "android/hardware/automotive/vehicle/2.0/IVehicle.h",
- "android/hardware/automotive/vehicle/2.0/IHwVehicle.h",
- "android/hardware/automotive/vehicle/2.0/BnHwVehicle.h",
- "android/hardware/automotive/vehicle/2.0/BpHwVehicle.h",
- "android/hardware/automotive/vehicle/2.0/BsVehicle.h",
- "android/hardware/automotive/vehicle/2.0/IVehicleCallback.h",
- "android/hardware/automotive/vehicle/2.0/IHwVehicleCallback.h",
- "android/hardware/automotive/vehicle/2.0/BnHwVehicleCallback.h",
- "android/hardware/automotive/vehicle/2.0/BpHwVehicleCallback.h",
- "android/hardware/automotive/vehicle/2.0/BsVehicleCallback.h",
- ],
-}
-
-cc_library {
- name: "android.hardware.automotive.vehicle@2.0",
- defaults: ["hidl-module-defaults"],
- generated_sources: ["android.hardware.automotive.vehicle@2.0_genc++"],
- generated_headers: ["android.hardware.automotive.vehicle@2.0_genc++_headers"],
- export_generated_headers: ["android.hardware.automotive.vehicle@2.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.automotive.vehicle-V2.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.automotive.vehicle@2.0",
- srcs: [
- ":android.hardware.automotive.vehicle@2.0_hal",
- ],
- out: [
- "android/hardware/automotive/vehicle/V2_0/DiagnosticFloatSensorIndex.java",
- "android/hardware/automotive/vehicle/V2_0/DiagnosticIntegerSensorIndex.java",
- "android/hardware/automotive/vehicle/V2_0/Obd2CommonIgnitionMonitors.java",
- "android/hardware/automotive/vehicle/V2_0/Obd2CompressionIgnitionMonitors.java",
- "android/hardware/automotive/vehicle/V2_0/Obd2FuelSystemStatus.java",
- "android/hardware/automotive/vehicle/V2_0/Obd2FuelType.java",
- "android/hardware/automotive/vehicle/V2_0/Obd2IgnitionMonitorKind.java",
- "android/hardware/automotive/vehicle/V2_0/Obd2SecondaryAirStatus.java",
- "android/hardware/automotive/vehicle/V2_0/Obd2SparkIgnitionMonitors.java",
- "android/hardware/automotive/vehicle/V2_0/StatusCode.java",
- "android/hardware/automotive/vehicle/V2_0/SubscribeFlags.java",
- "android/hardware/automotive/vehicle/V2_0/SubscribeOptions.java",
- "android/hardware/automotive/vehicle/V2_0/VehicleApPowerBootupReason.java",
- "android/hardware/automotive/vehicle/V2_0/VehicleApPowerSetState.java",
- "android/hardware/automotive/vehicle/V2_0/VehicleApPowerState.java",
- "android/hardware/automotive/vehicle/V2_0/VehicleApPowerStateConfigFlag.java",
- "android/hardware/automotive/vehicle/V2_0/VehicleApPowerStateIndex.java",
- "android/hardware/automotive/vehicle/V2_0/VehicleApPowerStateShutdownParam.java",
- "android/hardware/automotive/vehicle/V2_0/VehicleArea.java",
- "android/hardware/automotive/vehicle/V2_0/VehicleAreaConfig.java",
- "android/hardware/automotive/vehicle/V2_0/VehicleAreaDoor.java",
- "android/hardware/automotive/vehicle/V2_0/VehicleAreaMirror.java",
- "android/hardware/automotive/vehicle/V2_0/VehicleAreaSeat.java",
- "android/hardware/automotive/vehicle/V2_0/VehicleAreaWindow.java",
- "android/hardware/automotive/vehicle/V2_0/VehicleAreaZone.java",
- "android/hardware/automotive/vehicle/V2_0/VehicleAudioContextFlag.java",
- "android/hardware/automotive/vehicle/V2_0/VehicleAudioExtFocusFlag.java",
- "android/hardware/automotive/vehicle/V2_0/VehicleAudioFocusIndex.java",
- "android/hardware/automotive/vehicle/V2_0/VehicleAudioFocusRequest.java",
- "android/hardware/automotive/vehicle/V2_0/VehicleAudioFocusState.java",
- "android/hardware/automotive/vehicle/V2_0/VehicleAudioHwVariantConfigFlag.java",
- "android/hardware/automotive/vehicle/V2_0/VehicleAudioRoutingPolicyIndex.java",
- "android/hardware/automotive/vehicle/V2_0/VehicleAudioStream.java",
- "android/hardware/automotive/vehicle/V2_0/VehicleAudioStreamFlag.java",
- "android/hardware/automotive/vehicle/V2_0/VehicleAudioVolumeCapabilityFlag.java",
- "android/hardware/automotive/vehicle/V2_0/VehicleAudioVolumeIndex.java",
- "android/hardware/automotive/vehicle/V2_0/VehicleAudioVolumeLimitIndex.java",
- "android/hardware/automotive/vehicle/V2_0/VehicleAudioVolumeState.java",
- "android/hardware/automotive/vehicle/V2_0/VehicleDisplay.java",
- "android/hardware/automotive/vehicle/V2_0/VehicleDrivingStatus.java",
- "android/hardware/automotive/vehicle/V2_0/VehicleGear.java",
- "android/hardware/automotive/vehicle/V2_0/VehicleHvacFanDirection.java",
- "android/hardware/automotive/vehicle/V2_0/VehicleHwKeyInputAction.java",
- "android/hardware/automotive/vehicle/V2_0/VehicleIgnitionState.java",
- "android/hardware/automotive/vehicle/V2_0/VehicleInstrumentClusterType.java",
- "android/hardware/automotive/vehicle/V2_0/VehiclePropConfig.java",
- "android/hardware/automotive/vehicle/V2_0/VehiclePropValue.java",
- "android/hardware/automotive/vehicle/V2_0/VehicleProperty.java",
- "android/hardware/automotive/vehicle/V2_0/VehiclePropertyAccess.java",
- "android/hardware/automotive/vehicle/V2_0/VehiclePropertyChangeMode.java",
- "android/hardware/automotive/vehicle/V2_0/VehiclePropertyGroup.java",
- "android/hardware/automotive/vehicle/V2_0/VehiclePropertyOperation.java",
- "android/hardware/automotive/vehicle/V2_0/VehiclePropertyType.java",
- "android/hardware/automotive/vehicle/V2_0/VehicleRadioConstants.java",
- "android/hardware/automotive/vehicle/V2_0/VehicleTurnSignal.java",
- "android/hardware/automotive/vehicle/V2_0/VehicleUnit.java",
- "android/hardware/automotive/vehicle/V2_0/VmsAvailabilityStateIntegerValuesIndex.java",
- "android/hardware/automotive/vehicle/V2_0/VmsBaseMessageIntegerValuesIndex.java",
- "android/hardware/automotive/vehicle/V2_0/VmsMessageType.java",
- "android/hardware/automotive/vehicle/V2_0/VmsMessageWithLayerAndPublisherIdIntegerValuesIndex.java",
- "android/hardware/automotive/vehicle/V2_0/VmsMessageWithLayerIntegerValuesIndex.java",
- "android/hardware/automotive/vehicle/V2_0/VmsOfferingMessageIntegerValuesIndex.java",
- "android/hardware/automotive/vehicle/V2_0/VmsSubscriptionsStateIntegerValuesIndex.java",
- "android/hardware/automotive/vehicle/V2_0/Wheel.java",
- "android/hardware/automotive/vehicle/V2_0/IVehicle.java",
- "android/hardware/automotive/vehicle/V2_0/IVehicleCallback.java",
- ],
-}
-
-java_library {
- name: "android.hardware.automotive.vehicle-V2.0-java",
- no_framework_libs: true,
- defaults: ["hidl-java-module-defaults"],
- srcs: [":android.hardware.automotive.vehicle-V2.0-java_gen_java"],
- libs: [
- "hwbinder",
- "android.hidl.base-V1.0-java",
- ]
-}
-
-// This package does not export any types. Not creating java constants export.
-
-
-genrule {
- name: "android.hardware.automotive.vehicle@2.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.automotive.vehicle@2.0",
- srcs: [
- ":android.hardware.automotive.vehicle@2.0_hal",
- ],
- out: [
- "android/hardware/automotive/vehicle/2.0/AVehicle.cpp",
- "android/hardware/automotive/vehicle/2.0/AVehicleCallback.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.automotive.vehicle@2.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.automotive.vehicle@2.0",
- srcs: [
- ":android.hardware.automotive.vehicle@2.0_hal",
- ],
- out: [
- "android/hardware/automotive/vehicle/2.0/AVehicle.h",
- "android/hardware/automotive/vehicle/2.0/AVehicleCallback.h",
- ],
-}
-
-cc_library {
- name: "android.hardware.automotive.vehicle@2.0-adapter-helper",
- defaults: ["hidl-module-defaults"],
- generated_sources: ["android.hardware.automotive.vehicle@2.0-adapter-helper_genc++"],
- generated_headers: ["android.hardware.automotive.vehicle@2.0-adapter-helper_genc++_headers"],
- export_generated_headers: ["android.hardware.automotive.vehicle@2.0-adapter-helper_genc++_headers"],
- vendor_available: true,
- shared_libs: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "liblog",
- "libutils",
- "libcutils",
- "libhidladapter",
- "android.hardware.automotive.vehicle@2.0",
- "android.hidl.base@1.0-adapter-helper",
- ],
- export_shared_lib_headers: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "libutils",
- "libhidladapter",
- "android.hardware.automotive.vehicle@2.0",
- "android.hidl.base@1.0-adapter-helper",
- ],
-}
-
-genrule {
- name: "android.hardware.automotive.vehicle@2.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.automotive.vehicle@2.0",
- out: ["main.cpp"]
-}
-
-cc_test {
- name: "android.hardware.automotive.vehicle@2.0-adapter",
- defaults: ["hidl-module-defaults"],
- shared_libs: [
- "libhidladapter",
- "libhidlbase",
- "libhidltransport",
- "libutils",
- "android.hardware.automotive.vehicle@2.0",
- "android.hardware.automotive.vehicle@2.0-adapter-helper",
- ],
- generated_sources: ["android.hardware.automotive.vehicle@2.0-adapter_genc++"],
-}