Merge "Merge Vehicle HAL 2.1 iface to 2.0" into oc-mr1-dev (42606611) · Commits · e / os / android_hardware_interfaces

automotive/Android.bp

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -6,6 +6,4 @@ subdirs = [
	"vehicle/2.0",		"vehicle/2.0",
	"vehicle/2.0/default",		"vehicle/2.0/default",
	"vehicle/2.0/default/impl/vhal_v2_0/proto",		"vehicle/2.0/default/impl/vhal_v2_0/proto",
	"vehicle/2.1",
	"vehicle/2.1/default",
	]		]

automotive/vehicle/2.0/Android.mk

+608 −0

Original line number	Original line	Diff line number	Diff line
	@@ -16,6 +16,177 @@ LOCAL_JAVA_LIBRARIES := \
	android.hidl.base-V1.0-java \		android.hidl.base-V1.0-java \


			#
			# Build types.hal (DiagnosticFloatSensorIndex)
			#
			GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/DiagnosticFloatSensorIndex.java
			$(GEN): $(HIDL)
			$(GEN): PRIVATE_HIDL := $(HIDL)
			$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
			$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
			$(GEN): PRIVATE_CUSTOM_TOOL = \
			$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
			-Ljava \
			-randroid.hardware:hardware/interfaces \
			-randroid.hidl:system/libhidl/transport \
			android.hardware.automotive.vehicle@2.0::types.DiagnosticFloatSensorIndex

			$(GEN): $(LOCAL_PATH)/types.hal
			$(transform-generated-source)
			LOCAL_GENERATED_SOURCES += $(GEN)

			#
			# Build types.hal (DiagnosticIntegerSensorIndex)
			#
			GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/DiagnosticIntegerSensorIndex.java
			$(GEN): $(HIDL)
			$(GEN): PRIVATE_HIDL := $(HIDL)
			$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
			$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
			$(GEN): PRIVATE_CUSTOM_TOOL = \
			$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
			-Ljava \
			-randroid.hardware:hardware/interfaces \
			-randroid.hidl:system/libhidl/transport \
			android.hardware.automotive.vehicle@2.0::types.DiagnosticIntegerSensorIndex

			$(GEN): $(LOCAL_PATH)/types.hal
			$(transform-generated-source)
			LOCAL_GENERATED_SOURCES += $(GEN)

			#
			# Build types.hal (Obd2CommonIgnitionMonitors)
			#
			GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/Obd2CommonIgnitionMonitors.java
			$(GEN): $(HIDL)
			$(GEN): PRIVATE_HIDL := $(HIDL)
			$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
			$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
			$(GEN): PRIVATE_CUSTOM_TOOL = \
			$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
			-Ljava \
			-randroid.hardware:hardware/interfaces \
			-randroid.hidl:system/libhidl/transport \
			android.hardware.automotive.vehicle@2.0::types.Obd2CommonIgnitionMonitors

			$(GEN): $(LOCAL_PATH)/types.hal
			$(transform-generated-source)
			LOCAL_GENERATED_SOURCES += $(GEN)

			#
			# Build types.hal (Obd2CompressionIgnitionMonitors)
			#
			GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/Obd2CompressionIgnitionMonitors.java
			$(GEN): $(HIDL)
			$(GEN): PRIVATE_HIDL := $(HIDL)
			$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
			$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
			$(GEN): PRIVATE_CUSTOM_TOOL = \
			$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
			-Ljava \
			-randroid.hardware:hardware/interfaces \
			-randroid.hidl:system/libhidl/transport \
			android.hardware.automotive.vehicle@2.0::types.Obd2CompressionIgnitionMonitors

			$(GEN): $(LOCAL_PATH)/types.hal
			$(transform-generated-source)
			LOCAL_GENERATED_SOURCES += $(GEN)

			#
			# Build types.hal (Obd2FuelSystemStatus)
			#
			GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/Obd2FuelSystemStatus.java
			$(GEN): $(HIDL)
			$(GEN): PRIVATE_HIDL := $(HIDL)
			$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
			$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
			$(GEN): PRIVATE_CUSTOM_TOOL = \
			$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
			-Ljava \
			-randroid.hardware:hardware/interfaces \
			-randroid.hidl:system/libhidl/transport \
			android.hardware.automotive.vehicle@2.0::types.Obd2FuelSystemStatus

			$(GEN): $(LOCAL_PATH)/types.hal
			$(transform-generated-source)
			LOCAL_GENERATED_SOURCES += $(GEN)

			#
			# Build types.hal (Obd2FuelType)
			#
			GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/Obd2FuelType.java
			$(GEN): $(HIDL)
			$(GEN): PRIVATE_HIDL := $(HIDL)
			$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
			$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
			$(GEN): PRIVATE_CUSTOM_TOOL = \
			$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
			-Ljava \
			-randroid.hardware:hardware/interfaces \
			-randroid.hidl:system/libhidl/transport \
			android.hardware.automotive.vehicle@2.0::types.Obd2FuelType

			$(GEN): $(LOCAL_PATH)/types.hal
			$(transform-generated-source)
			LOCAL_GENERATED_SOURCES += $(GEN)

			#
			# Build types.hal (Obd2IgnitionMonitorKind)
			#
			GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/Obd2IgnitionMonitorKind.java
			$(GEN): $(HIDL)
			$(GEN): PRIVATE_HIDL := $(HIDL)
			$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
			$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
			$(GEN): PRIVATE_CUSTOM_TOOL = \
			$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
			-Ljava \
			-randroid.hardware:hardware/interfaces \
			-randroid.hidl:system/libhidl/transport \
			android.hardware.automotive.vehicle@2.0::types.Obd2IgnitionMonitorKind

			$(GEN): $(LOCAL_PATH)/types.hal
			$(transform-generated-source)
			LOCAL_GENERATED_SOURCES += $(GEN)

			#
			# Build types.hal (Obd2SecondaryAirStatus)
			#
			GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/Obd2SecondaryAirStatus.java
			$(GEN): $(HIDL)
			$(GEN): PRIVATE_HIDL := $(HIDL)
			$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
			$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
			$(GEN): PRIVATE_CUSTOM_TOOL = \
			$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
			-Ljava \
			-randroid.hardware:hardware/interfaces \
			-randroid.hidl:system/libhidl/transport \
			android.hardware.automotive.vehicle@2.0::types.Obd2SecondaryAirStatus

			$(GEN): $(LOCAL_PATH)/types.hal
			$(transform-generated-source)
			LOCAL_GENERATED_SOURCES += $(GEN)

			#
			# Build types.hal (Obd2SparkIgnitionMonitors)
			#
			GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/Obd2SparkIgnitionMonitors.java
			$(GEN): $(HIDL)
			$(GEN): PRIVATE_HIDL := $(HIDL)
			$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
			$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
			$(GEN): PRIVATE_CUSTOM_TOOL = \
			$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
			-Ljava \
			-randroid.hardware:hardware/interfaces \
			-randroid.hidl:system/libhidl/transport \
			android.hardware.automotive.vehicle@2.0::types.Obd2SparkIgnitionMonitors

			$(GEN): $(LOCAL_PATH)/types.hal
			$(transform-generated-source)
			LOCAL_GENERATED_SOURCES += $(GEN)

	#		#
	# Build types.hal (StatusCode)		# Build types.hal (StatusCode)
	#		#
	@@ -909,6 +1080,139 @@ $(GEN): $(LOCAL_PATH)/types.hal
	$(transform-generated-source)		$(transform-generated-source)
	LOCAL_GENERATED_SOURCES += $(GEN)		LOCAL_GENERATED_SOURCES += $(GEN)

			#
			# Build types.hal (VmsAvailabilityStateIntegerValuesIndex)
			#
			GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VmsAvailabilityStateIntegerValuesIndex.java
			$(GEN): $(HIDL)
			$(GEN): PRIVATE_HIDL := $(HIDL)
			$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
			$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
			$(GEN): PRIVATE_CUSTOM_TOOL = \
			$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
			-Ljava \
			-randroid.hardware:hardware/interfaces \
			-randroid.hidl:system/libhidl/transport \
			android.hardware.automotive.vehicle@2.0::types.VmsAvailabilityStateIntegerValuesIndex

			$(GEN): $(LOCAL_PATH)/types.hal
			$(transform-generated-source)
			LOCAL_GENERATED_SOURCES += $(GEN)

			#
			# Build types.hal (VmsBaseMessageIntegerValuesIndex)
			#
			GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VmsBaseMessageIntegerValuesIndex.java
			$(GEN): $(HIDL)
			$(GEN): PRIVATE_HIDL := $(HIDL)
			$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
			$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
			$(GEN): PRIVATE_CUSTOM_TOOL = \
			$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
			-Ljava \
			-randroid.hardware:hardware/interfaces \
			-randroid.hidl:system/libhidl/transport \
			android.hardware.automotive.vehicle@2.0::types.VmsBaseMessageIntegerValuesIndex

			$(GEN): $(LOCAL_PATH)/types.hal
			$(transform-generated-source)
			LOCAL_GENERATED_SOURCES += $(GEN)

			#
			# Build types.hal (VmsMessageType)
			#
			GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VmsMessageType.java
			$(GEN): $(HIDL)
			$(GEN): PRIVATE_HIDL := $(HIDL)
			$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
			$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
			$(GEN): PRIVATE_CUSTOM_TOOL = \
			$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
			-Ljava \
			-randroid.hardware:hardware/interfaces \
			-randroid.hidl:system/libhidl/transport \
			android.hardware.automotive.vehicle@2.0::types.VmsMessageType

			$(GEN): $(LOCAL_PATH)/types.hal
			$(transform-generated-source)
			LOCAL_GENERATED_SOURCES += $(GEN)

			#
			# Build types.hal (VmsMessageWithLayerAndPublisherIdIntegerValuesIndex)
			#
			GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VmsMessageWithLayerAndPublisherIdIntegerValuesIndex.java
			$(GEN): $(HIDL)
			$(GEN): PRIVATE_HIDL := $(HIDL)
			$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
			$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
			$(GEN): PRIVATE_CUSTOM_TOOL = \
			$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
			-Ljava \
			-randroid.hardware:hardware/interfaces \
			-randroid.hidl:system/libhidl/transport \
			android.hardware.automotive.vehicle@2.0::types.VmsMessageWithLayerAndPublisherIdIntegerValuesIndex

			$(GEN): $(LOCAL_PATH)/types.hal
			$(transform-generated-source)
			LOCAL_GENERATED_SOURCES += $(GEN)

			#
			# Build types.hal (VmsMessageWithLayerIntegerValuesIndex)
			#
			GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VmsMessageWithLayerIntegerValuesIndex.java
			$(GEN): $(HIDL)
			$(GEN): PRIVATE_HIDL := $(HIDL)
			$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
			$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
			$(GEN): PRIVATE_CUSTOM_TOOL = \
			$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
			-Ljava \
			-randroid.hardware:hardware/interfaces \
			-randroid.hidl:system/libhidl/transport \
			android.hardware.automotive.vehicle@2.0::types.VmsMessageWithLayerIntegerValuesIndex

			$(GEN): $(LOCAL_PATH)/types.hal
			$(transform-generated-source)
			LOCAL_GENERATED_SOURCES += $(GEN)

			#
			# Build types.hal (VmsOfferingMessageIntegerValuesIndex)
			#
			GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VmsOfferingMessageIntegerValuesIndex.java
			$(GEN): $(HIDL)
			$(GEN): PRIVATE_HIDL := $(HIDL)
			$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
			$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
			$(GEN): PRIVATE_CUSTOM_TOOL = \
			$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
			-Ljava \
			-randroid.hardware:hardware/interfaces \
			-randroid.hidl:system/libhidl/transport \
			android.hardware.automotive.vehicle@2.0::types.VmsOfferingMessageIntegerValuesIndex

			$(GEN): $(LOCAL_PATH)/types.hal
			$(transform-generated-source)
			LOCAL_GENERATED_SOURCES += $(GEN)

			#
			# Build types.hal (VmsSubscriptionsStateIntegerValuesIndex)
			#
			GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VmsSubscriptionsStateIntegerValuesIndex.java
			$(GEN): $(HIDL)
			$(GEN): PRIVATE_HIDL := $(HIDL)
			$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
			$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
			$(GEN): PRIVATE_CUSTOM_TOOL = \
			$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
			-Ljava \
			-randroid.hardware:hardware/interfaces \
			-randroid.hidl:system/libhidl/transport \
			android.hardware.automotive.vehicle@2.0::types.VmsSubscriptionsStateIntegerValuesIndex

			$(GEN): $(LOCAL_PATH)/types.hal
			$(transform-generated-source)
			LOCAL_GENERATED_SOURCES += $(GEN)

	#		#
	# Build types.hal (Wheel)		# Build types.hal (Wheel)
	#		#
	@@ -988,6 +1292,177 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
	android.hidl.base-V1.0-java-static \		android.hidl.base-V1.0-java-static \


			#
			# Build types.hal (DiagnosticFloatSensorIndex)
			#
			GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/DiagnosticFloatSensorIndex.java
			$(GEN): $(HIDL)
			$(GEN): PRIVATE_HIDL := $(HIDL)
			$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
			$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
			$(GEN): PRIVATE_CUSTOM_TOOL = \
			$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
			-Ljava \
			-randroid.hardware:hardware/interfaces \
			-randroid.hidl:system/libhidl/transport \
			android.hardware.automotive.vehicle@2.0::types.DiagnosticFloatSensorIndex

			$(GEN): $(LOCAL_PATH)/types.hal
			$(transform-generated-source)
			LOCAL_GENERATED_SOURCES += $(GEN)

			#
			# Build types.hal (DiagnosticIntegerSensorIndex)
			#
			GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/DiagnosticIntegerSensorIndex.java
			$(GEN): $(HIDL)
			$(GEN): PRIVATE_HIDL := $(HIDL)
			$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
			$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
			$(GEN): PRIVATE_CUSTOM_TOOL = \
			$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
			-Ljava \
			-randroid.hardware:hardware/interfaces \
			-randroid.hidl:system/libhidl/transport \
			android.hardware.automotive.vehicle@2.0::types.DiagnosticIntegerSensorIndex

			$(GEN): $(LOCAL_PATH)/types.hal
			$(transform-generated-source)
			LOCAL_GENERATED_SOURCES += $(GEN)

			#
			# Build types.hal (Obd2CommonIgnitionMonitors)
			#
			GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/Obd2CommonIgnitionMonitors.java
			$(GEN): $(HIDL)
			$(GEN): PRIVATE_HIDL := $(HIDL)
			$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
			$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
			$(GEN): PRIVATE_CUSTOM_TOOL = \
			$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
			-Ljava \
			-randroid.hardware:hardware/interfaces \
			-randroid.hidl:system/libhidl/transport \
			android.hardware.automotive.vehicle@2.0::types.Obd2CommonIgnitionMonitors

			$(GEN): $(LOCAL_PATH)/types.hal
			$(transform-generated-source)
			LOCAL_GENERATED_SOURCES += $(GEN)

			#
			# Build types.hal (Obd2CompressionIgnitionMonitors)
			#
			GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/Obd2CompressionIgnitionMonitors.java
			$(GEN): $(HIDL)
			$(GEN): PRIVATE_HIDL := $(HIDL)
			$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
			$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
			$(GEN): PRIVATE_CUSTOM_TOOL = \
			$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
			-Ljava \
			-randroid.hardware:hardware/interfaces \
			-randroid.hidl:system/libhidl/transport \
			android.hardware.automotive.vehicle@2.0::types.Obd2CompressionIgnitionMonitors

			$(GEN): $(LOCAL_PATH)/types.hal
			$(transform-generated-source)
			LOCAL_GENERATED_SOURCES += $(GEN)

			#
			# Build types.hal (Obd2FuelSystemStatus)
			#
			GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/Obd2FuelSystemStatus.java
			$(GEN): $(HIDL)
			$(GEN): PRIVATE_HIDL := $(HIDL)
			$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
			$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
			$(GEN): PRIVATE_CUSTOM_TOOL = \
			$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
			-Ljava \
			-randroid.hardware:hardware/interfaces \
			-randroid.hidl:system/libhidl/transport \
			android.hardware.automotive.vehicle@2.0::types.Obd2FuelSystemStatus

			$(GEN): $(LOCAL_PATH)/types.hal
			$(transform-generated-source)
			LOCAL_GENERATED_SOURCES += $(GEN)

			#
			# Build types.hal (Obd2FuelType)
			#
			GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/Obd2FuelType.java
			$(GEN): $(HIDL)
			$(GEN): PRIVATE_HIDL := $(HIDL)
			$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
			$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
			$(GEN): PRIVATE_CUSTOM_TOOL = \
			$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
			-Ljava \
			-randroid.hardware:hardware/interfaces \
			-randroid.hidl:system/libhidl/transport \
			android.hardware.automotive.vehicle@2.0::types.Obd2FuelType

			$(GEN): $(LOCAL_PATH)/types.hal
			$(transform-generated-source)
			LOCAL_GENERATED_SOURCES += $(GEN)

			#
			# Build types.hal (Obd2IgnitionMonitorKind)
			#
			GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/Obd2IgnitionMonitorKind.java
			$(GEN): $(HIDL)
			$(GEN): PRIVATE_HIDL := $(HIDL)
			$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
			$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
			$(GEN): PRIVATE_CUSTOM_TOOL = \
			$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
			-Ljava \
			-randroid.hardware:hardware/interfaces \
			-randroid.hidl:system/libhidl/transport \
			android.hardware.automotive.vehicle@2.0::types.Obd2IgnitionMonitorKind

			$(GEN): $(LOCAL_PATH)/types.hal
			$(transform-generated-source)
			LOCAL_GENERATED_SOURCES += $(GEN)

			#
			# Build types.hal (Obd2SecondaryAirStatus)
			#
			GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/Obd2SecondaryAirStatus.java
			$(GEN): $(HIDL)
			$(GEN): PRIVATE_HIDL := $(HIDL)
			$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
			$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
			$(GEN): PRIVATE_CUSTOM_TOOL = \
			$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
			-Ljava \
			-randroid.hardware:hardware/interfaces \
			-randroid.hidl:system/libhidl/transport \
			android.hardware.automotive.vehicle@2.0::types.Obd2SecondaryAirStatus

			$(GEN): $(LOCAL_PATH)/types.hal
			$(transform-generated-source)
			LOCAL_GENERATED_SOURCES += $(GEN)

			#
			# Build types.hal (Obd2SparkIgnitionMonitors)
			#
			GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/Obd2SparkIgnitionMonitors.java
			$(GEN): $(HIDL)
			$(GEN): PRIVATE_HIDL := $(HIDL)
			$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
			$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
			$(GEN): PRIVATE_CUSTOM_TOOL = \
			$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
			-Ljava \
			-randroid.hardware:hardware/interfaces \
			-randroid.hidl:system/libhidl/transport \
			android.hardware.automotive.vehicle@2.0::types.Obd2SparkIgnitionMonitors

			$(GEN): $(LOCAL_PATH)/types.hal
			$(transform-generated-source)
			LOCAL_GENERATED_SOURCES += $(GEN)

	#		#
	# Build types.hal (StatusCode)		# Build types.hal (StatusCode)
	#		#
	@@ -1881,6 +2356,139 @@ $(GEN): $(LOCAL_PATH)/types.hal
	$(transform-generated-source)		$(transform-generated-source)
	LOCAL_GENERATED_SOURCES += $(GEN)		LOCAL_GENERATED_SOURCES += $(GEN)

			#
			# Build types.hal (VmsAvailabilityStateIntegerValuesIndex)
			#
			GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VmsAvailabilityStateIntegerValuesIndex.java
			$(GEN): $(HIDL)
			$(GEN): PRIVATE_HIDL := $(HIDL)
			$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
			$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
			$(GEN): PRIVATE_CUSTOM_TOOL = \
			$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
			-Ljava \
			-randroid.hardware:hardware/interfaces \
			-randroid.hidl:system/libhidl/transport \
			android.hardware.automotive.vehicle@2.0::types.VmsAvailabilityStateIntegerValuesIndex

			$(GEN): $(LOCAL_PATH)/types.hal
			$(transform-generated-source)
			LOCAL_GENERATED_SOURCES += $(GEN)

			#
			# Build types.hal (VmsBaseMessageIntegerValuesIndex)
			#
			GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VmsBaseMessageIntegerValuesIndex.java
			$(GEN): $(HIDL)
			$(GEN): PRIVATE_HIDL := $(HIDL)
			$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
			$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
			$(GEN): PRIVATE_CUSTOM_TOOL = \
			$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
			-Ljava \
			-randroid.hardware:hardware/interfaces \
			-randroid.hidl:system/libhidl/transport \
			android.hardware.automotive.vehicle@2.0::types.VmsBaseMessageIntegerValuesIndex

			$(GEN): $(LOCAL_PATH)/types.hal
			$(transform-generated-source)
			LOCAL_GENERATED_SOURCES += $(GEN)

			#
			# Build types.hal (VmsMessageType)
			#
			GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VmsMessageType.java
			$(GEN): $(HIDL)
			$(GEN): PRIVATE_HIDL := $(HIDL)
			$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
			$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
			$(GEN): PRIVATE_CUSTOM_TOOL = \
			$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
			-Ljava \
			-randroid.hardware:hardware/interfaces \
			-randroid.hidl:system/libhidl/transport \
			android.hardware.automotive.vehicle@2.0::types.VmsMessageType

			$(GEN): $(LOCAL_PATH)/types.hal
			$(transform-generated-source)
			LOCAL_GENERATED_SOURCES += $(GEN)

			#
			# Build types.hal (VmsMessageWithLayerAndPublisherIdIntegerValuesIndex)
			#
			GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VmsMessageWithLayerAndPublisherIdIntegerValuesIndex.java
			$(GEN): $(HIDL)
			$(GEN): PRIVATE_HIDL := $(HIDL)
			$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
			$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
			$(GEN): PRIVATE_CUSTOM_TOOL = \
			$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
			-Ljava \
			-randroid.hardware:hardware/interfaces \
			-randroid.hidl:system/libhidl/transport \
			android.hardware.automotive.vehicle@2.0::types.VmsMessageWithLayerAndPublisherIdIntegerValuesIndex

			$(GEN): $(LOCAL_PATH)/types.hal
			$(transform-generated-source)
			LOCAL_GENERATED_SOURCES += $(GEN)

			#
			# Build types.hal (VmsMessageWithLayerIntegerValuesIndex)
			#
			GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VmsMessageWithLayerIntegerValuesIndex.java
			$(GEN): $(HIDL)
			$(GEN): PRIVATE_HIDL := $(HIDL)
			$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
			$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
			$(GEN): PRIVATE_CUSTOM_TOOL = \
			$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
			-Ljava \
			-randroid.hardware:hardware/interfaces \
			-randroid.hidl:system/libhidl/transport \
			android.hardware.automotive.vehicle@2.0::types.VmsMessageWithLayerIntegerValuesIndex

			$(GEN): $(LOCAL_PATH)/types.hal
			$(transform-generated-source)
			LOCAL_GENERATED_SOURCES += $(GEN)

			#
			# Build types.hal (VmsOfferingMessageIntegerValuesIndex)
			#
			GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VmsOfferingMessageIntegerValuesIndex.java
			$(GEN): $(HIDL)
			$(GEN): PRIVATE_HIDL := $(HIDL)
			$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
			$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
			$(GEN): PRIVATE_CUSTOM_TOOL = \
			$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
			-Ljava \
			-randroid.hardware:hardware/interfaces \
			-randroid.hidl:system/libhidl/transport \
			android.hardware.automotive.vehicle@2.0::types.VmsOfferingMessageIntegerValuesIndex

			$(GEN): $(LOCAL_PATH)/types.hal
			$(transform-generated-source)
			LOCAL_GENERATED_SOURCES += $(GEN)

			#
			# Build types.hal (VmsSubscriptionsStateIntegerValuesIndex)
			#
			GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VmsSubscriptionsStateIntegerValuesIndex.java
			$(GEN): $(HIDL)
			$(GEN): PRIVATE_HIDL := $(HIDL)
			$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
			$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
			$(GEN): PRIVATE_CUSTOM_TOOL = \
			$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
			-Ljava \
			-randroid.hardware:hardware/interfaces \
			-randroid.hidl:system/libhidl/transport \
			android.hardware.automotive.vehicle@2.0::types.VmsSubscriptionsStateIntegerValuesIndex

			$(GEN): $(LOCAL_PATH)/types.hal
			$(transform-generated-source)
			LOCAL_GENERATED_SOURCES += $(GEN)

	#		#
	# Build types.hal (Wheel)		# Build types.hal (Wheel)
	#		#

automotive/vehicle/2.0/default/Android.bp

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -40,6 +40,7 @@ cc_library_static {
	vendor: true,		vendor: true,
	defaults: ["vhal_v2_0_defaults"],		defaults: ["vhal_v2_0_defaults"],
	srcs: [		srcs: [
			"common/src/Obd2SensorStore.cpp",
	"common/src/SubscriptionManager.cpp",		"common/src/SubscriptionManager.cpp",
	"common/src/VehicleHalManager.cpp",		"common/src/VehicleHalManager.cpp",
	"common/src/VehicleObjectPool.cpp",		"common/src/VehicleObjectPool.cpp",

automotive/vehicle/2.1/default/common/include/vhal_v2_1/Obd2SensorStore.h→automotive/vehicle/2.0/default/common/include/vhal_v2_0/Obd2SensorStore.h

+15 −16

Original line number	Original line	Diff line number	Diff line
	@@ -14,18 +14,18 @@
	* limitations under the License.		* limitations under the License.
	*/		*/

	#ifndef android_hardware_automotive_vehicle_V2_1_Obd2SensorStore_H_		#ifndef android_hardware_automotive_vehicle_V2_0_Obd2SensorStore_H_
	#define android_hardware_automotive_vehicle_V2_1_Obd2SensorStore_H_		#define android_hardware_automotive_vehicle_V2_0_Obd2SensorStore_H_

	#include <vector>		#include <vector>

	#include <android/hardware/automotive/vehicle/2.1/types.h>		#include <android/hardware/automotive/vehicle/2.0/types.h>

	namespace android {		namespace android {
	namespace hardware {		namespace hardware {
	namespace automotive {		namespace automotive {
	namespace vehicle {		namespace vehicle {
	namespace V2_1 {		namespace V2_0 {

	// This class wraps all the logic required to create an OBD2 frame.		// This class wraps all the logic required to create an OBD2 frame.
	// It allows storing sensor values, setting appropriate bitmasks as needed,		// It allows storing sensor values, setting appropriate bitmasks as needed,
	@@ -34,18 +34,17 @@ namespace V2_1 {
	class Obd2SensorStore {		class Obd2SensorStore {
	public:		public:
	// Creates a sensor storage with a given number of vendor-specific sensors.		// Creates a sensor storage with a given number of vendor-specific sensors.
	Obd2SensorStore(size_t numVendorIntegerSensors,		Obd2SensorStore(size_t numVendorIntegerSensors, size_t numVendorFloatSensors);
	size_t numVendorFloatSensors);

	// Stores an integer-valued sensor.		// Stores an integer-valued sensor.
	V2_0::StatusCode setIntegerSensor(DiagnosticIntegerSensorIndex index, int32_t value);		StatusCode setIntegerSensor(DiagnosticIntegerSensorIndex index, int32_t value);
	// Stores an integer-valued sensor.		// Stores an integer-valued sensor.
	V2_0::StatusCode setIntegerSensor(size_t index, int32_t value);		StatusCode setIntegerSensor(size_t index, int32_t value);

	// Stores a float-valued sensor.		// Stores a float-valued sensor.
	V2_0::StatusCode setFloatSensor(DiagnosticFloatSensorIndex index, float value);		StatusCode setFloatSensor(DiagnosticFloatSensorIndex index, float value);
	// Stores a float-valued sensor.		// Stores a float-valued sensor.
	V2_0::StatusCode setFloatSensor(size_t index, float value);		StatusCode setFloatSensor(size_t index, float value);

	// Returns a vector that contains all integer sensors stored.		// Returns a vector that contains all integer sensors stored.
	const std::vector<int32_t>& getIntegerSensors() const;		const std::vector<int32_t>& getIntegerSensors() const;
	@@ -55,7 +54,7 @@ public:
	const std::vector<uint8_t>& getSensorsBitmask() const;		const std::vector<uint8_t>& getSensorsBitmask() const;

	// Given a stringValue, fill in a VehiclePropValue		// Given a stringValue, fill in a VehiclePropValue
	void fillPropValue(const std::string& dtc, V2_0::VehiclePropValue *propValue) const;		void fillPropValue(const std::string& dtc, VehiclePropValue* propValue) const;

	private:		private:
	class BitmaskInVector {		class BitmaskInVector {
	@@ -76,7 +75,7 @@ private:
	BitmaskInVector mSensorsBitmask;		BitmaskInVector mSensorsBitmask;
	};		};

	} // namespace V2_1		} // namespace V2_0
	} // namespace vehicle		} // namespace vehicle
	} // namespace automotive		} // namespace automotive
	} // namespace hardware		} // namespace hardware