Update for Soong-only makefiles.
Test: pass
Bug: 33420795
Change-Id: Ibec6d1e38939b9e7566a96381439be2aac3bf8ca
diff --git a/automotive/vehicle/2.0/Android.bp b/automotive/vehicle/2.0/Android.bp
index 0d0d28f..10f99b1 100644
--- a/automotive/vehicle/2.0/Android.bp
+++ b/automotive/vehicle/2.0/Android.bp
@@ -73,6 +73,97 @@
}
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",
@@ -98,7 +189,6 @@
],
}
-
cc_library {
name: "android.hardware.automotive.vehicle@2.0-adapter-helper",
defaults: ["hidl-module-defaults"],