summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CleanSpec.mk1
-rw-r--r--audio/2.0/default/android.hardware.audio@2.0-service.rc2
-rw-r--r--automotive/evs/1.0/default/ServiceNames.h2
-rw-r--r--automotive/evs/1.0/default/android.hardware.automotive.evs@1.0-service.rc2
-rw-r--r--automotive/evs/1.0/vts/functional/Android.bp2
-rw-r--r--automotive/vehicle/2.0/Android.mk1278
-rw-r--r--automotive/vehicle/2.0/default/android.hardware.automotive.vehicle@2.0-service.rc2
-rw-r--r--biometrics/fingerprint/2.1/default/android.hardware.biometrics.fingerprint@2.1-service.rc2
-rw-r--r--bluetooth/1.0/default/android.hardware.bluetooth@1.0-service.rc10
-rw-r--r--boot/1.0/default/android.hardware.boot@1.0-service.rc2
-rw-r--r--broadcastradio/1.1/vts/functional/Android.bp4
-rw-r--r--broadcastradio/1.2/Android.bp84
-rw-r--r--broadcastradio/1.2/IBroadcastRadioFactory.hal29
-rw-r--r--broadcastradio/1.2/ITuner.hal68
-rw-r--r--broadcastradio/1.2/ITunerCallback.hal36
-rw-r--r--broadcastradio/1.2/default/Android.bp (renamed from broadcastradio/1.1/default/Android.bp)7
-rw-r--r--broadcastradio/1.2/default/BroadcastRadio.cpp (renamed from broadcastradio/1.1/default/BroadcastRadio.cpp)9
-rw-r--r--broadcastradio/1.2/default/BroadcastRadio.h (renamed from broadcastradio/1.1/default/BroadcastRadio.h)12
-rw-r--r--broadcastradio/1.2/default/BroadcastRadioFactory.cpp (renamed from broadcastradio/1.1/default/BroadcastRadioFactory.cpp)8
-rw-r--r--broadcastradio/1.2/default/BroadcastRadioFactory.h (renamed from broadcastradio/1.1/default/BroadcastRadioFactory.h)18
-rw-r--r--broadcastradio/1.2/default/OWNERS (renamed from broadcastradio/1.1/default/OWNERS)1
-rw-r--r--broadcastradio/1.2/default/Tuner.cpp (renamed from broadcastradio/1.1/default/Tuner.cpp)39
-rw-r--r--broadcastradio/1.2/default/Tuner.h (renamed from broadcastradio/1.1/default/Tuner.h)33
-rw-r--r--broadcastradio/1.2/default/VirtualProgram.cpp (renamed from broadcastradio/1.1/default/VirtualProgram.cpp)7
-rw-r--r--broadcastradio/1.2/default/VirtualProgram.h (renamed from broadcastradio/1.1/default/VirtualProgram.h)20
-rw-r--r--broadcastradio/1.2/default/VirtualRadio.cpp (renamed from broadcastradio/1.1/default/VirtualRadio.cpp)5
-rw-r--r--broadcastradio/1.2/default/VirtualRadio.h (renamed from broadcastradio/1.1/default/VirtualRadio.h)12
-rw-r--r--broadcastradio/1.2/default/android.hardware.broadcastradio@1.2-service.rc (renamed from broadcastradio/1.1/default/android.hardware.broadcastradio@1.1-service.rc)2
-rw-r--r--broadcastradio/1.2/default/resources.h (renamed from broadcastradio/1.1/default/resources.h)10
-rw-r--r--broadcastradio/1.2/default/service.cpp (renamed from broadcastradio/1.1/default/service.cpp)2
-rw-r--r--broadcastradio/1.2/types.hal23
-rw-r--r--broadcastradio/1.2/vts/OWNERS (renamed from broadcastradio/1.1/tests/OWNERS)1
-rw-r--r--broadcastradio/1.2/vts/functional/Android.bp29
-rw-r--r--broadcastradio/1.2/vts/functional/VtsHalBroadcastradioV1_2TargetTest.cpp312
-rw-r--r--broadcastradio/Android.bp10
-rw-r--r--broadcastradio/common/tests/Android.bp (renamed from broadcastradio/1.1/tests/Android.bp)6
-rw-r--r--broadcastradio/common/tests/OWNERS7
-rw-r--r--broadcastradio/common/tests/WorkerThread_test.cpp (renamed from broadcastradio/1.1/tests/WorkerThread_test.cpp)0
-rw-r--r--broadcastradio/common/utils/Android.bp (renamed from broadcastradio/1.1/utils/Android.bp)2
-rw-r--r--broadcastradio/common/utils/OWNERS (renamed from broadcastradio/1.1/utils/OWNERS)1
-rw-r--r--broadcastradio/common/utils/Utils.cpp (renamed from broadcastradio/1.1/utils/Utils.cpp)10
-rw-r--r--broadcastradio/common/utils/WorkerThread.cpp (renamed from broadcastradio/1.1/utils/WorkerThread.cpp)0
-rw-r--r--broadcastradio/common/utils/include/broadcastradio-utils/Utils.h (renamed from broadcastradio/1.1/utils/include/broadcastradio-utils/Utils.h)29
-rw-r--r--broadcastradio/common/utils/include/broadcastradio-utils/WorkerThread.h (renamed from broadcastradio/1.1/utils/include/broadcastradio-utils/WorkerThread.h)6
-rw-r--r--broadcastradio/common/vts/utils/Android.bp (renamed from broadcastradio/1.1/vts/utils/Android.bp)2
-rw-r--r--broadcastradio/common/vts/utils/OWNERS7
-rw-r--r--broadcastradio/common/vts/utils/call-barrier.cpp (renamed from broadcastradio/1.1/vts/utils/call-barrier.cpp)0
-rw-r--r--broadcastradio/common/vts/utils/include/broadcastradio-vts-utils/call-barrier.h (renamed from broadcastradio/1.1/vts/utils/include/broadcastradio-vts-utils/call-barrier.h)0
-rw-r--r--broadcastradio/common/vts/utils/include/broadcastradio-vts-utils/mock-timeout.h (renamed from broadcastradio/1.1/vts/utils/include/broadcastradio-vts-utils/mock-timeout.h)0
-rw-r--r--camera/device/3.3/Android.bp85
-rw-r--r--camera/provider/2.4/default/android.hardware.camera.provider@2.4-service.rc2
-rw-r--r--cas/1.0/Android.bp80
-rw-r--r--cas/1.0/Android.mk (renamed from cas/1.0/CasHal.mk)122
-rw-r--r--cas/1.0/default/android.hardware.cas@1.0-service.rc2
-rw-r--r--cas/Android.bp2
-rw-r--r--cas/native/1.0/Android.bp79
-rw-r--r--compatibility_matrix.26.xml2
-rw-r--r--compatibility_matrix.current.xml2
-rw-r--r--compatibility_matrix.legacy.xml2
-rw-r--r--configstore/1.0/default/android.hardware.configstore@1.0-service.rc4
-rw-r--r--configstore/1.1/Android.bp143
-rw-r--r--configstore/1.1/Android.mk44
-rw-r--r--configstore/1.1/ISurfaceFlingerConfigs.hal25
-rw-r--r--configstore/1.1/default/Android.mk (renamed from configstore/1.0/default/Android.mk)11
-rw-r--r--configstore/1.1/default/SurfaceFlingerConfigs.cpp (renamed from configstore/1.0/default/SurfaceFlingerConfigs.cpp)7
-rw-r--r--configstore/1.1/default/SurfaceFlingerConfigs.h (renamed from configstore/1.0/default/SurfaceFlingerConfigs.h)17
-rw-r--r--configstore/1.1/default/android.hardware.configstore@1.1-service.rc4
-rw-r--r--configstore/1.1/default/seccomp_policy/configstore@1.1-arm64.policy (renamed from configstore/1.0/default/seccomp_policy/configstore@1.0-arm64.policy)0
-rw-r--r--configstore/1.1/default/service.cpp (renamed from configstore/1.0/default/service.cpp)10
-rw-r--r--configstore/1.1/default/surfaceflinger.mk (renamed from configstore/1.0/default/surfaceflinger.mk)0
-rw-r--r--configstore/1.1/vts/functional/Android.bp26
-rw-r--r--configstore/1.1/vts/functional/VtsHalConfigstoreV1_1TargetTest.cpp55
-rw-r--r--configstore/Android.bp2
-rw-r--r--contexthub/1.0/default/OWNERS2
-rw-r--r--contexthub/1.0/default/android.hardware.contexthub@1.0-service.rc2
-rw-r--r--contexthub/1.0/vts/functional/OWNERS7
-rw-r--r--current.txt1
-rw-r--r--drm/1.0/default/android.hardware.drm@1.0-service.rc2
-rw-r--r--dumpstate/1.0/default/android.hardware.dumpstate@1.0-service.rc2
-rw-r--r--gatekeeper/1.0/default/android.hardware.gatekeeper@1.0-service.rc2
-rw-r--r--gnss/1.0/default/Gnss.cpp19
-rw-r--r--gnss/1.0/default/android.hardware.gnss@1.0-service.rc2
-rw-r--r--graphics/Android.bp2
-rw-r--r--graphics/allocator/2.0/default/android.hardware.graphics.allocator@2.0-service.rc2
-rw-r--r--graphics/composer/2.1/default/android.hardware.graphics.composer@2.1-service.rc2
-rw-r--r--graphics/composer/2.1/vts/OWNERS6
-rw-r--r--graphics/mapper/2.0/vts/OWNERS6
-rw-r--r--graphics/mapper/2.1/Android.bp149
-rw-r--r--graphics/mapper/2.1/IMapper.hal61
-rw-r--r--graphics/mapper/2.1/vts/OWNERS6
-rw-r--r--graphics/mapper/2.1/vts/functional/Android.bp32
-rw-r--r--graphics/mapper/2.1/vts/functional/VtsHalGraphicsMapperV2_1TargetTest.cpp247
-rw-r--r--health/1.0/default/android.hardware.health@1.0-service.rc2
-rw-r--r--ir/1.0/default/android.hardware.ir@1.0-service.rc4
-rw-r--r--keymaster/3.0/default/Android.mk2
-rw-r--r--keymaster/3.0/default/KeymasterDevice.cpp710
-rw-r--r--keymaster/3.0/default/KeymasterDevice.h64
-rw-r--r--keymaster/3.0/default/android.hardware.keymaster@3.0-service.rc2
-rw-r--r--keymaster/3.0/vts/functional/keymaster_hidl_hal_test.cpp47
-rw-r--r--light/2.0/default/Android.bp53
-rw-r--r--light/2.0/default/Android.mk44
-rw-r--r--light/2.0/default/android.hardware.light@2.0-service.rc4
-rw-r--r--light/Android.bp1
-rw-r--r--media/omx/1.0/vts/OWNERS7
-rw-r--r--memtrack/1.0/default/android.hardware.memtrack@1.0-service.rc2
-rw-r--r--nfc/1.0/default/android.hardware.nfc@1.0-service.rc2
-rw-r--r--oemlock/1.0/Android.bp74
-rw-r--r--power/1.0/default/android.hardware.power@1.0-service.rc2
-rw-r--r--power/1.1/Android.bp79
-rw-r--r--radio/1.0/vts/functional/radio_hidl_hal_data.cpp5
-rw-r--r--radio/1.0/vts/functional/radio_hidl_hal_icc.cpp510
-rw-r--r--radio/1.0/vts/functional/radio_hidl_hal_misc.cpp8
-rw-r--r--radio/1.0/vts/functional/radio_hidl_hal_sms.cpp30
-rw-r--r--radio/1.0/vts/functional/radio_hidl_hal_stk.cpp3
-rw-r--r--radio/1.0/vts/functional/sap_hidl_hal_test.cpp26
-rw-r--r--sensors/1.0/default/android.hardware.sensors@1.0-service.rc2
-rw-r--r--sensors/1.0/vts/functional/Android.bp4
-rw-r--r--soundtrigger/2.0/default/SoundTriggerHalImpl.cpp6
-rw-r--r--tests/extension/light/2.0/default/android.hardware.tests.extension.light@2.0-service.rc4
-rw-r--r--thermal/1.0/default/android.hardware.thermal@1.0-service.rc2
-rw-r--r--thermal/1.1/Android.bp81
-rw-r--r--tv/cec/1.0/default/android.hardware.tv.cec@1.0-service.rc2
-rw-r--r--tv/input/1.0/default/android.hardware.tv.input@1.0-service.rc2
-rw-r--r--usb/1.0/default/android.hardware.usb@1.0-service.rc2
-rw-r--r--usb/1.1/Android.bp81
-rw-r--r--vibrator/1.0/default/android.hardware.vibrator@1.0-service.rc2
-rw-r--r--vibrator/1.1/Android.bp79
-rw-r--r--vr/1.0/default/android.hardware.vr@1.0-service.rc2
-rw-r--r--weaver/1.0/Android.bp74
-rw-r--r--wifi/1.1/Android.bp81
-rw-r--r--wifi/1.1/default/android.hardware.wifi@1.0-service.rc4
-rw-r--r--wifi/1.2/Android.bp159
-rw-r--r--wifi/1.2/Android.mk64
-rw-r--r--wifi/1.2/IWifi.hal29
-rw-r--r--wifi/1.2/IWifiChip.hal27
-rw-r--r--wifi/1.2/default/Android.mk (renamed from wifi/1.1/default/Android.mk)1
-rw-r--r--wifi/1.2/default/OWNERS (renamed from wifi/1.1/default/OWNERS)0
-rw-r--r--wifi/1.2/default/THREADING.README (renamed from wifi/1.1/default/THREADING.README)0
-rw-r--r--wifi/1.2/default/android.hardware.wifi@1.0-service.rc4
-rw-r--r--wifi/1.2/default/hidl_callback_util.h (renamed from wifi/1.1/default/hidl_callback_util.h)4
-rw-r--r--wifi/1.2/default/hidl_return_util.h (renamed from wifi/1.1/default/hidl_return_util.h)4
-rw-r--r--wifi/1.2/default/hidl_struct_util.cpp (renamed from wifi/1.1/default/hidl_struct_util.cpp)4
-rw-r--r--wifi/1.2/default/hidl_struct_util.h (renamed from wifi/1.1/default/hidl_struct_util.h)4
-rw-r--r--wifi/1.2/default/hidl_sync_util.cpp (renamed from wifi/1.1/default/hidl_sync_util.cpp)4
-rw-r--r--wifi/1.2/default/hidl_sync_util.h (renamed from wifi/1.1/default/hidl_sync_util.h)4
-rw-r--r--wifi/1.2/default/service.cpp (renamed from wifi/1.1/default/service.cpp)4
-rw-r--r--wifi/1.2/default/wifi.cpp (renamed from wifi/1.1/default/wifi.cpp)4
-rw-r--r--wifi/1.2/default/wifi.h (renamed from wifi/1.1/default/wifi.h)9
-rw-r--r--wifi/1.2/default/wifi_ap_iface.cpp (renamed from wifi/1.1/default/wifi_ap_iface.cpp)4
-rw-r--r--wifi/1.2/default/wifi_ap_iface.h (renamed from wifi/1.1/default/wifi_ap_iface.h)4
-rw-r--r--wifi/1.2/default/wifi_chip.cpp (renamed from wifi/1.1/default/wifi_chip.cpp)4
-rw-r--r--wifi/1.2/default/wifi_chip.h (renamed from wifi/1.1/default/wifi_chip.h)4
-rw-r--r--wifi/1.2/default/wifi_feature_flags.h (renamed from wifi/1.1/default/wifi_feature_flags.h)4
-rw-r--r--wifi/1.2/default/wifi_legacy_hal.cpp (renamed from wifi/1.1/default/wifi_legacy_hal.cpp)4
-rw-r--r--wifi/1.2/default/wifi_legacy_hal.h (renamed from wifi/1.1/default/wifi_legacy_hal.h)4
-rw-r--r--wifi/1.2/default/wifi_legacy_hal_stubs.cpp (renamed from wifi/1.1/default/wifi_legacy_hal_stubs.cpp)4
-rw-r--r--wifi/1.2/default/wifi_legacy_hal_stubs.h (renamed from wifi/1.1/default/wifi_legacy_hal_stubs.h)4
-rw-r--r--wifi/1.2/default/wifi_mode_controller.cpp (renamed from wifi/1.1/default/wifi_mode_controller.cpp)4
-rw-r--r--wifi/1.2/default/wifi_mode_controller.h (renamed from wifi/1.1/default/wifi_mode_controller.h)4
-rw-r--r--wifi/1.2/default/wifi_nan_iface.cpp (renamed from wifi/1.1/default/wifi_nan_iface.cpp)4
-rw-r--r--wifi/1.2/default/wifi_nan_iface.h (renamed from wifi/1.1/default/wifi_nan_iface.h)4
-rw-r--r--wifi/1.2/default/wifi_p2p_iface.cpp (renamed from wifi/1.1/default/wifi_p2p_iface.cpp)4
-rw-r--r--wifi/1.2/default/wifi_p2p_iface.h (renamed from wifi/1.1/default/wifi_p2p_iface.h)4
-rw-r--r--wifi/1.2/default/wifi_rtt_controller.cpp (renamed from wifi/1.1/default/wifi_rtt_controller.cpp)4
-rw-r--r--wifi/1.2/default/wifi_rtt_controller.h (renamed from wifi/1.1/default/wifi_rtt_controller.h)4
-rw-r--r--wifi/1.2/default/wifi_sta_iface.cpp (renamed from wifi/1.1/default/wifi_sta_iface.cpp)4
-rw-r--r--wifi/1.2/default/wifi_sta_iface.h (renamed from wifi/1.1/default/wifi_sta_iface.h)4
-rw-r--r--wifi/1.2/default/wifi_status_util.cpp (renamed from wifi/1.1/default/wifi_status_util.cpp)4
-rw-r--r--wifi/1.2/default/wifi_status_util.h (renamed from wifi/1.1/default/wifi_status_util.h)4
-rw-r--r--wifi/Android.bp1
-rw-r--r--wifi/offload/1.0/Android.bp76
171 files changed, 3327 insertions, 2700 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk
index dd4cee02..e82fefa0 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -60,6 +60,5 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/bin/hw/android.hardware.auto
60$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/hw/android.hardware.automotive*) 60$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/hw/android.hardware.automotive*)
61$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib64/hw/android.hardware.automotive*) 61$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib64/hw/android.hardware.automotive*)
62$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/init/android.hardware.automotive*) 62$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/init/android.hardware.automotive*)
63$(call add-clean-step, find $(PRODUCT_OUT)/system $(PRODUCT_OUT)/vendor -type f -name "android\.hardware\.configstore\@1\.1*" -print0 | xargs -0 rm -f)
64$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/android.hardware.tests*) 63$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/android.hardware.tests*)
65$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/vndk/android.hardware.tests*) 64$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/vndk/android.hardware.tests*)
diff --git a/audio/2.0/default/android.hardware.audio@2.0-service.rc b/audio/2.0/default/android.hardware.audio@2.0-service.rc
index eeaf71b2..a76770d7 100644
--- a/audio/2.0/default/android.hardware.audio@2.0-service.rc
+++ b/audio/2.0/default/android.hardware.audio@2.0-service.rc
@@ -1,4 +1,4 @@
1service audio-hal-2-0 /vendor/bin/hw/android.hardware.audio@2.0-service 1service vendor.audio-hal-2-0 /vendor/bin/hw/android.hardware.audio@2.0-service
2 class hal 2 class hal
3 user audioserver 3 user audioserver
4 # media gid needed for /dev/fm (radio) and for /data/misc/media (tee) 4 # media gid needed for /dev/fm (radio) and for /data/misc/media (tee)
diff --git a/automotive/evs/1.0/default/ServiceNames.h b/automotive/evs/1.0/default/ServiceNames.h
index d20a37f9..1178da5a 100644
--- a/automotive/evs/1.0/default/ServiceNames.h
+++ b/automotive/evs/1.0/default/ServiceNames.h
@@ -14,4 +14,4 @@
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 16
17const static char kEnumeratorServiceName[] = "EvsEnumeratorHw-Mock"; 17const static char kEnumeratorServiceName[] = "EvsEnumeratorHw";
diff --git a/automotive/evs/1.0/default/android.hardware.automotive.evs@1.0-service.rc b/automotive/evs/1.0/default/android.hardware.automotive.evs@1.0-service.rc
index 16d521d7..117c249a 100644
--- a/automotive/evs/1.0/default/android.hardware.automotive.evs@1.0-service.rc
+++ b/automotive/evs/1.0/default/android.hardware.automotive.evs@1.0-service.rc
@@ -1,4 +1,4 @@
1service evs-hal-mock /vendor/bin/hw/android.hardware.automotive.evs@1.0-service 1service vendor.evs-hal-mock /vendor/bin/hw/android.hardware.automotive.evs@1.0-service
2 class hal 2 class hal
3 user automotive_evs 3 user automotive_evs
4 group automotive_evs 4 group automotive_evs
diff --git a/automotive/evs/1.0/vts/functional/Android.bp b/automotive/evs/1.0/vts/functional/Android.bp
index 555ff5bc..6ac24589 100644
--- a/automotive/evs/1.0/vts/functional/Android.bp
+++ b/automotive/evs/1.0/vts/functional/Android.bp
@@ -15,7 +15,7 @@
15// 15//
16 16
17cc_test { 17cc_test {
18 name: "VtsHalEvsV1_0Target", 18 name: "VtsHalEvsV1_0TargetTest",
19 19
20 srcs: [ 20 srcs: [
21 "VtsHalEvsV1_0TargetTest.cpp", 21 "VtsHalEvsV1_0TargetTest.cpp",
diff --git a/automotive/vehicle/2.0/Android.mk b/automotive/vehicle/2.0/Android.mk
index 59194874..ec18766a 100644
--- a/automotive/vehicle/2.0/Android.mk
+++ b/automotive/vehicle/2.0/Android.mk
@@ -15,6 +15,8 @@ HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
15LOCAL_JAVA_LIBRARIES := \ 15LOCAL_JAVA_LIBRARIES := \
16 android.hidl.base-V1.0-java \ 16 android.hidl.base-V1.0-java \
17 17
18LOCAL_NO_STANDARD_LIBRARIES := true
19LOCAL_JAVA_LIBRARIES += core-oj hwbinder
18 20
19# 21#
20# Build types.hal (DiagnosticFloatSensorIndex) 22# Build types.hal (DiagnosticFloatSensorIndex)
@@ -1278,1281 +1280,5 @@ LOCAL_GENERATED_SOURCES += $(GEN)
1278include $(BUILD_JAVA_LIBRARY) 1280include $(BUILD_JAVA_LIBRARY)
1279 1281
1280 1282
1281################################################################################
1282
1283include $(CLEAR_VARS)
1284LOCAL_MODULE := android.hardware.automotive.vehicle-V2.0-java-static
1285LOCAL_MODULE_CLASS := JAVA_LIBRARIES
1286
1287intermediates := $(call local-generated-sources-dir, COMMON)
1288
1289HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
1290
1291LOCAL_STATIC_JAVA_LIBRARIES := \
1292 android.hidl.base-V1.0-java-static \
1293
1294
1295#
1296# Build types.hal (DiagnosticFloatSensorIndex)
1297#
1298GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/DiagnosticFloatSensorIndex.java
1299$(GEN): $(HIDL)
1300$(GEN): PRIVATE_HIDL := $(HIDL)
1301$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
1302$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
1303$(GEN): PRIVATE_CUSTOM_TOOL = \
1304 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
1305 -Ljava \
1306 -randroid.hardware:hardware/interfaces \
1307 -randroid.hidl:system/libhidl/transport \
1308 android.hardware.automotive.vehicle@2.0::types.DiagnosticFloatSensorIndex
1309
1310$(GEN): $(LOCAL_PATH)/types.hal
1311 $(transform-generated-source)
1312LOCAL_GENERATED_SOURCES += $(GEN)
1313
1314#
1315# Build types.hal (DiagnosticIntegerSensorIndex)
1316#
1317GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/DiagnosticIntegerSensorIndex.java
1318$(GEN): $(HIDL)
1319$(GEN): PRIVATE_HIDL := $(HIDL)
1320$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
1321$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
1322$(GEN): PRIVATE_CUSTOM_TOOL = \
1323 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
1324 -Ljava \
1325 -randroid.hardware:hardware/interfaces \
1326 -randroid.hidl:system/libhidl/transport \
1327 android.hardware.automotive.vehicle@2.0::types.DiagnosticIntegerSensorIndex
1328
1329$(GEN): $(LOCAL_PATH)/types.hal
1330 $(transform-generated-source)
1331LOCAL_GENERATED_SOURCES += $(GEN)
1332
1333#
1334# Build types.hal (Obd2CommonIgnitionMonitors)
1335#
1336GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/Obd2CommonIgnitionMonitors.java
1337$(GEN): $(HIDL)
1338$(GEN): PRIVATE_HIDL := $(HIDL)
1339$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
1340$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
1341$(GEN): PRIVATE_CUSTOM_TOOL = \
1342 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
1343 -Ljava \
1344 -randroid.hardware:hardware/interfaces \
1345 -randroid.hidl:system/libhidl/transport \
1346 android.hardware.automotive.vehicle@2.0::types.Obd2CommonIgnitionMonitors
1347
1348$(GEN): $(LOCAL_PATH)/types.hal
1349 $(transform-generated-source)
1350LOCAL_GENERATED_SOURCES += $(GEN)
1351
1352#
1353# Build types.hal (Obd2CompressionIgnitionMonitors)
1354#
1355GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/Obd2CompressionIgnitionMonitors.java
1356$(GEN): $(HIDL)
1357$(GEN): PRIVATE_HIDL := $(HIDL)
1358$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
1359$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
1360$(GEN): PRIVATE_CUSTOM_TOOL = \
1361 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
1362 -Ljava \
1363 -randroid.hardware:hardware/interfaces \
1364 -randroid.hidl:system/libhidl/transport \
1365 android.hardware.automotive.vehicle@2.0::types.Obd2CompressionIgnitionMonitors
1366
1367$(GEN): $(LOCAL_PATH)/types.hal
1368 $(transform-generated-source)
1369LOCAL_GENERATED_SOURCES += $(GEN)
1370
1371#
1372# Build types.hal (Obd2FuelSystemStatus)
1373#
1374GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/Obd2FuelSystemStatus.java
1375$(GEN): $(HIDL)
1376$(GEN): PRIVATE_HIDL := $(HIDL)
1377$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
1378$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
1379$(GEN): PRIVATE_CUSTOM_TOOL = \
1380 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
1381 -Ljava \
1382 -randroid.hardware:hardware/interfaces \
1383 -randroid.hidl:system/libhidl/transport \
1384 android.hardware.automotive.vehicle@2.0::types.Obd2FuelSystemStatus
1385
1386$(GEN): $(LOCAL_PATH)/types.hal
1387 $(transform-generated-source)
1388LOCAL_GENERATED_SOURCES += $(GEN)
1389
1390#
1391# Build types.hal (Obd2FuelType)
1392#
1393GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/Obd2FuelType.java
1394$(GEN): $(HIDL)
1395$(GEN): PRIVATE_HIDL := $(HIDL)
1396$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
1397$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
1398$(GEN): PRIVATE_CUSTOM_TOOL = \
1399 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
1400 -Ljava \
1401 -randroid.hardware:hardware/interfaces \
1402 -randroid.hidl:system/libhidl/transport \
1403 android.hardware.automotive.vehicle@2.0::types.Obd2FuelType
1404
1405$(GEN): $(LOCAL_PATH)/types.hal
1406 $(transform-generated-source)
1407LOCAL_GENERATED_SOURCES += $(GEN)
1408
1409#
1410# Build types.hal (Obd2IgnitionMonitorKind)
1411#
1412GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/Obd2IgnitionMonitorKind.java
1413$(GEN): $(HIDL)
1414$(GEN): PRIVATE_HIDL := $(HIDL)
1415$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
1416$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
1417$(GEN): PRIVATE_CUSTOM_TOOL = \
1418 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
1419 -Ljava \
1420 -randroid.hardware:hardware/interfaces \
1421 -randroid.hidl:system/libhidl/transport \
1422 android.hardware.automotive.vehicle@2.0::types.Obd2IgnitionMonitorKind
1423
1424$(GEN): $(LOCAL_PATH)/types.hal
1425 $(transform-generated-source)
1426LOCAL_GENERATED_SOURCES += $(GEN)
1427
1428#
1429# Build types.hal (Obd2SecondaryAirStatus)
1430#
1431GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/Obd2SecondaryAirStatus.java
1432$(GEN): $(HIDL)
1433$(GEN): PRIVATE_HIDL := $(HIDL)
1434$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
1435$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
1436$(GEN): PRIVATE_CUSTOM_TOOL = \
1437 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
1438 -Ljava \
1439 -randroid.hardware:hardware/interfaces \
1440 -randroid.hidl:system/libhidl/transport \
1441 android.hardware.automotive.vehicle@2.0::types.Obd2SecondaryAirStatus
1442
1443$(GEN): $(LOCAL_PATH)/types.hal
1444 $(transform-generated-source)
1445LOCAL_GENERATED_SOURCES += $(GEN)
1446
1447#
1448# Build types.hal (Obd2SparkIgnitionMonitors)
1449#
1450GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/Obd2SparkIgnitionMonitors.java
1451$(GEN): $(HIDL)
1452$(GEN): PRIVATE_HIDL := $(HIDL)
1453$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
1454$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
1455$(GEN): PRIVATE_CUSTOM_TOOL = \
1456 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
1457 -Ljava \
1458 -randroid.hardware:hardware/interfaces \
1459 -randroid.hidl:system/libhidl/transport \
1460 android.hardware.automotive.vehicle@2.0::types.Obd2SparkIgnitionMonitors
1461
1462$(GEN): $(LOCAL_PATH)/types.hal
1463 $(transform-generated-source)
1464LOCAL_GENERATED_SOURCES += $(GEN)
1465
1466#
1467# Build types.hal (StatusCode)
1468#
1469GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/StatusCode.java
1470$(GEN): $(HIDL)
1471$(GEN): PRIVATE_HIDL := $(HIDL)
1472$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
1473$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
1474$(GEN): PRIVATE_CUSTOM_TOOL = \
1475 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
1476 -Ljava \
1477 -randroid.hardware:hardware/interfaces \
1478 -randroid.hidl:system/libhidl/transport \
1479 android.hardware.automotive.vehicle@2.0::types.StatusCode
1480
1481$(GEN): $(LOCAL_PATH)/types.hal
1482 $(transform-generated-source)
1483LOCAL_GENERATED_SOURCES += $(GEN)
1484
1485#
1486# Build types.hal (SubscribeFlags)
1487#
1488GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/SubscribeFlags.java
1489$(GEN): $(HIDL)
1490$(GEN): PRIVATE_HIDL := $(HIDL)
1491$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
1492$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
1493$(GEN): PRIVATE_CUSTOM_TOOL = \
1494 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
1495 -Ljava \
1496 -randroid.hardware:hardware/interfaces \
1497 -randroid.hidl:system/libhidl/transport \
1498 android.hardware.automotive.vehicle@2.0::types.SubscribeFlags
1499
1500$(GEN): $(LOCAL_PATH)/types.hal
1501 $(transform-generated-source)
1502LOCAL_GENERATED_SOURCES += $(GEN)
1503
1504#
1505# Build types.hal (SubscribeOptions)
1506#
1507GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/SubscribeOptions.java
1508$(GEN): $(HIDL)
1509$(GEN): PRIVATE_HIDL := $(HIDL)
1510$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
1511$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
1512$(GEN): PRIVATE_CUSTOM_TOOL = \
1513 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
1514 -Ljava \
1515 -randroid.hardware:hardware/interfaces \
1516 -randroid.hidl:system/libhidl/transport \
1517 android.hardware.automotive.vehicle@2.0::types.SubscribeOptions
1518
1519$(GEN): $(LOCAL_PATH)/types.hal
1520 $(transform-generated-source)
1521LOCAL_GENERATED_SOURCES += $(GEN)
1522
1523#
1524# Build types.hal (VehicleApPowerBootupReason)
1525#
1526GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleApPowerBootupReason.java
1527$(GEN): $(HIDL)
1528$(GEN): PRIVATE_HIDL := $(HIDL)
1529$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
1530$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
1531$(GEN): PRIVATE_CUSTOM_TOOL = \
1532 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
1533 -Ljava \
1534 -randroid.hardware:hardware/interfaces \
1535 -randroid.hidl:system/libhidl/transport \
1536 android.hardware.automotive.vehicle@2.0::types.VehicleApPowerBootupReason
1537
1538$(GEN): $(LOCAL_PATH)/types.hal
1539 $(transform-generated-source)
1540LOCAL_GENERATED_SOURCES += $(GEN)
1541
1542#
1543# Build types.hal (VehicleApPowerSetState)
1544#
1545GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleApPowerSetState.java
1546$(GEN): $(HIDL)
1547$(GEN): PRIVATE_HIDL := $(HIDL)
1548$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
1549$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
1550$(GEN): PRIVATE_CUSTOM_TOOL = \
1551 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
1552 -Ljava \
1553 -randroid.hardware:hardware/interfaces \
1554 -randroid.hidl:system/libhidl/transport \
1555 android.hardware.automotive.vehicle@2.0::types.VehicleApPowerSetState
1556
1557$(GEN): $(LOCAL_PATH)/types.hal
1558 $(transform-generated-source)
1559LOCAL_GENERATED_SOURCES += $(GEN)
1560
1561#
1562# Build types.hal (VehicleApPowerState)
1563#
1564GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleApPowerState.java
1565$(GEN): $(HIDL)
1566$(GEN): PRIVATE_HIDL := $(HIDL)
1567$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
1568$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
1569$(GEN): PRIVATE_CUSTOM_TOOL = \
1570 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
1571 -Ljava \
1572 -randroid.hardware:hardware/interfaces \
1573 -randroid.hidl:system/libhidl/transport \
1574 android.hardware.automotive.vehicle@2.0::types.VehicleApPowerState
1575
1576$(GEN): $(LOCAL_PATH)/types.hal
1577 $(transform-generated-source)
1578LOCAL_GENERATED_SOURCES += $(GEN)
1579
1580#
1581# Build types.hal (VehicleApPowerStateConfigFlag)
1582#
1583GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleApPowerStateConfigFlag.java
1584$(GEN): $(HIDL)
1585$(GEN): PRIVATE_HIDL := $(HIDL)
1586$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
1587$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
1588$(GEN): PRIVATE_CUSTOM_TOOL = \
1589 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
1590 -Ljava \
1591 -randroid.hardware:hardware/interfaces \
1592 -randroid.hidl:system/libhidl/transport \
1593 android.hardware.automotive.vehicle@2.0::types.VehicleApPowerStateConfigFlag
1594
1595$(GEN): $(LOCAL_PATH)/types.hal
1596 $(transform-generated-source)
1597LOCAL_GENERATED_SOURCES += $(GEN)
1598
1599#
1600# Build types.hal (VehicleApPowerStateIndex)
1601#
1602GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleApPowerStateIndex.java
1603$(GEN): $(HIDL)
1604$(GEN): PRIVATE_HIDL := $(HIDL)
1605$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
1606$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
1607$(GEN): PRIVATE_CUSTOM_TOOL = \
1608 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
1609 -Ljava \
1610 -randroid.hardware:hardware/interfaces \
1611 -randroid.hidl:system/libhidl/transport \
1612 android.hardware.automotive.vehicle@2.0::types.VehicleApPowerStateIndex
1613
1614$(GEN): $(LOCAL_PATH)/types.hal
1615 $(transform-generated-source)
1616LOCAL_GENERATED_SOURCES += $(GEN)
1617
1618#
1619# Build types.hal (VehicleApPowerStateShutdownParam)
1620#
1621GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleApPowerStateShutdownParam.java
1622$(GEN): $(HIDL)
1623$(GEN): PRIVATE_HIDL := $(HIDL)
1624$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
1625$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
1626$(GEN): PRIVATE_CUSTOM_TOOL = \
1627 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
1628 -Ljava \
1629 -randroid.hardware:hardware/interfaces \
1630 -randroid.hidl:system/libhidl/transport \
1631 android.hardware.automotive.vehicle@2.0::types.VehicleApPowerStateShutdownParam
1632
1633$(GEN): $(LOCAL_PATH)/types.hal
1634 $(transform-generated-source)
1635LOCAL_GENERATED_SOURCES += $(GEN)
1636
1637#
1638# Build types.hal (VehicleArea)
1639#
1640GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleArea.java
1641$(GEN): $(HIDL)
1642$(GEN): PRIVATE_HIDL := $(HIDL)
1643$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
1644$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
1645$(GEN): PRIVATE_CUSTOM_TOOL = \
1646 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
1647 -Ljava \
1648 -randroid.hardware:hardware/interfaces \
1649 -randroid.hidl:system/libhidl/transport \
1650 android.hardware.automotive.vehicle@2.0::types.VehicleArea
1651
1652$(GEN): $(LOCAL_PATH)/types.hal
1653 $(transform-generated-source)
1654LOCAL_GENERATED_SOURCES += $(GEN)
1655
1656#
1657# Build types.hal (VehicleAreaConfig)
1658#
1659GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAreaConfig.java
1660$(GEN): $(HIDL)
1661$(GEN): PRIVATE_HIDL := $(HIDL)
1662$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
1663$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
1664$(GEN): PRIVATE_CUSTOM_TOOL = \
1665 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
1666 -Ljava \
1667 -randroid.hardware:hardware/interfaces \
1668 -randroid.hidl:system/libhidl/transport \
1669 android.hardware.automotive.vehicle@2.0::types.VehicleAreaConfig
1670
1671$(GEN): $(LOCAL_PATH)/types.hal
1672 $(transform-generated-source)
1673LOCAL_GENERATED_SOURCES += $(GEN)
1674
1675#
1676# Build types.hal (VehicleAreaDoor)
1677#
1678GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAreaDoor.java
1679$(GEN): $(HIDL)
1680$(GEN): PRIVATE_HIDL := $(HIDL)
1681$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
1682$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
1683$(GEN): PRIVATE_CUSTOM_TOOL = \
1684 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
1685 -Ljava \
1686 -randroid.hardware:hardware/interfaces \
1687 -randroid.hidl:system/libhidl/transport \
1688 android.hardware.automotive.vehicle@2.0::types.VehicleAreaDoor
1689
1690$(GEN): $(LOCAL_PATH)/types.hal
1691 $(transform-generated-source)
1692LOCAL_GENERATED_SOURCES += $(GEN)
1693
1694#
1695# Build types.hal (VehicleAreaMirror)
1696#
1697GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAreaMirror.java
1698$(GEN): $(HIDL)
1699$(GEN): PRIVATE_HIDL := $(HIDL)
1700$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
1701$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
1702$(GEN): PRIVATE_CUSTOM_TOOL = \
1703 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
1704 -Ljava \
1705 -randroid.hardware:hardware/interfaces \
1706 -randroid.hidl:system/libhidl/transport \
1707 android.hardware.automotive.vehicle@2.0::types.VehicleAreaMirror
1708
1709$(GEN): $(LOCAL_PATH)/types.hal
1710 $(transform-generated-source)
1711LOCAL_GENERATED_SOURCES += $(GEN)
1712
1713#
1714# Build types.hal (VehicleAreaSeat)
1715#
1716GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAreaSeat.java
1717$(GEN): $(HIDL)
1718$(GEN): PRIVATE_HIDL := $(HIDL)
1719$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
1720$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
1721$(GEN): PRIVATE_CUSTOM_TOOL = \
1722 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
1723 -Ljava \
1724 -randroid.hardware:hardware/interfaces \
1725 -randroid.hidl:system/libhidl/transport \
1726 android.hardware.automotive.vehicle@2.0::types.VehicleAreaSeat
1727
1728$(GEN): $(LOCAL_PATH)/types.hal
1729 $(transform-generated-source)
1730LOCAL_GENERATED_SOURCES += $(GEN)
1731
1732#
1733# Build types.hal (VehicleAreaWindow)
1734#
1735GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAreaWindow.java
1736$(GEN): $(HIDL)
1737$(GEN): PRIVATE_HIDL := $(HIDL)
1738$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
1739$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
1740$(GEN): PRIVATE_CUSTOM_TOOL = \
1741 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
1742 -Ljava \
1743 -randroid.hardware:hardware/interfaces \
1744 -randroid.hidl:system/libhidl/transport \
1745 android.hardware.automotive.vehicle@2.0::types.VehicleAreaWindow
1746
1747$(GEN): $(LOCAL_PATH)/types.hal
1748 $(transform-generated-source)
1749LOCAL_GENERATED_SOURCES += $(GEN)
1750
1751#
1752# Build types.hal (VehicleAreaZone)
1753#
1754GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAreaZone.java
1755$(GEN): $(HIDL)
1756$(GEN): PRIVATE_HIDL := $(HIDL)
1757$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
1758$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
1759$(GEN): PRIVATE_CUSTOM_TOOL = \
1760 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
1761 -Ljava \
1762 -randroid.hardware:hardware/interfaces \
1763 -randroid.hidl:system/libhidl/transport \
1764 android.hardware.automotive.vehicle@2.0::types.VehicleAreaZone
1765
1766$(GEN): $(LOCAL_PATH)/types.hal
1767 $(transform-generated-source)
1768LOCAL_GENERATED_SOURCES += $(GEN)
1769
1770#
1771# Build types.hal (VehicleAudioContextFlag)
1772#
1773GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAudioContextFlag.java
1774$(GEN): $(HIDL)
1775$(GEN): PRIVATE_HIDL := $(HIDL)
1776$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
1777$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
1778$(GEN): PRIVATE_CUSTOM_TOOL = \
1779 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
1780 -Ljava \
1781 -randroid.hardware:hardware/interfaces \
1782 -randroid.hidl:system/libhidl/transport \
1783 android.hardware.automotive.vehicle@2.0::types.VehicleAudioContextFlag
1784
1785$(GEN): $(LOCAL_PATH)/types.hal
1786 $(transform-generated-source)
1787LOCAL_GENERATED_SOURCES += $(GEN)
1788
1789#
1790# Build types.hal (VehicleAudioExtFocusFlag)
1791#
1792GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAudioExtFocusFlag.java
1793$(GEN): $(HIDL)
1794$(GEN): PRIVATE_HIDL := $(HIDL)
1795$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
1796$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
1797$(GEN): PRIVATE_CUSTOM_TOOL = \
1798 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
1799 -Ljava \
1800 -randroid.hardware:hardware/interfaces \
1801 -randroid.hidl:system/libhidl/transport \
1802 android.hardware.automotive.vehicle@2.0::types.VehicleAudioExtFocusFlag
1803
1804$(GEN): $(LOCAL_PATH)/types.hal
1805 $(transform-generated-source)
1806LOCAL_GENERATED_SOURCES += $(GEN)
1807
1808#
1809# Build types.hal (VehicleAudioFocusIndex)
1810#
1811GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAudioFocusIndex.java
1812$(GEN): $(HIDL)
1813$(GEN): PRIVATE_HIDL := $(HIDL)
1814$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
1815$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
1816$(GEN): PRIVATE_CUSTOM_TOOL = \
1817 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
1818 -Ljava \
1819 -randroid.hardware:hardware/interfaces \
1820 -randroid.hidl:system/libhidl/transport \
1821 android.hardware.automotive.vehicle@2.0::types.VehicleAudioFocusIndex
1822
1823$(GEN): $(LOCAL_PATH)/types.hal
1824 $(transform-generated-source)
1825LOCAL_GENERATED_SOURCES += $(GEN)
1826
1827#
1828# Build types.hal (VehicleAudioFocusRequest)
1829#
1830GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAudioFocusRequest.java
1831$(GEN): $(HIDL)
1832$(GEN): PRIVATE_HIDL := $(HIDL)
1833$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
1834$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
1835$(GEN): PRIVATE_CUSTOM_TOOL = \
1836 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
1837 -Ljava \
1838 -randroid.hardware:hardware/interfaces \
1839 -randroid.hidl:system/libhidl/transport \
1840 android.hardware.automotive.vehicle@2.0::types.VehicleAudioFocusRequest
1841
1842$(GEN): $(LOCAL_PATH)/types.hal
1843 $(transform-generated-source)
1844LOCAL_GENERATED_SOURCES += $(GEN)
1845
1846#
1847# Build types.hal (VehicleAudioFocusState)
1848#
1849GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAudioFocusState.java
1850$(GEN): $(HIDL)
1851$(GEN): PRIVATE_HIDL := $(HIDL)
1852$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
1853$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
1854$(GEN): PRIVATE_CUSTOM_TOOL = \
1855 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
1856 -Ljava \
1857 -randroid.hardware:hardware/interfaces \
1858 -randroid.hidl:system/libhidl/transport \
1859 android.hardware.automotive.vehicle@2.0::types.VehicleAudioFocusState
1860
1861$(GEN): $(LOCAL_PATH)/types.hal
1862 $(transform-generated-source)
1863LOCAL_GENERATED_SOURCES += $(GEN)
1864
1865#
1866# Build types.hal (VehicleAudioHwVariantConfigFlag)
1867#
1868GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAudioHwVariantConfigFlag.java
1869$(GEN): $(HIDL)
1870$(GEN): PRIVATE_HIDL := $(HIDL)
1871$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
1872$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
1873$(GEN): PRIVATE_CUSTOM_TOOL = \
1874 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
1875 -Ljava \
1876 -randroid.hardware:hardware/interfaces \
1877 -randroid.hidl:system/libhidl/transport \
1878 android.hardware.automotive.vehicle@2.0::types.VehicleAudioHwVariantConfigFlag
1879
1880$(GEN): $(LOCAL_PATH)/types.hal
1881 $(transform-generated-source)
1882LOCAL_GENERATED_SOURCES += $(GEN)
1883
1884#
1885# Build types.hal (VehicleAudioRoutingPolicyIndex)
1886#
1887GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAudioRoutingPolicyIndex.java
1888$(GEN): $(HIDL)
1889$(GEN): PRIVATE_HIDL := $(HIDL)
1890$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
1891$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
1892$(GEN): PRIVATE_CUSTOM_TOOL = \
1893 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
1894 -Ljava \
1895 -randroid.hardware:hardware/interfaces \
1896 -randroid.hidl:system/libhidl/transport \
1897 android.hardware.automotive.vehicle@2.0::types.VehicleAudioRoutingPolicyIndex
1898
1899$(GEN): $(LOCAL_PATH)/types.hal
1900 $(transform-generated-source)
1901LOCAL_GENERATED_SOURCES += $(GEN)
1902
1903#
1904# Build types.hal (VehicleAudioStream)
1905#
1906GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAudioStream.java
1907$(GEN): $(HIDL)
1908$(GEN): PRIVATE_HIDL := $(HIDL)
1909$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
1910$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
1911$(GEN): PRIVATE_CUSTOM_TOOL = \
1912 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
1913 -Ljava \
1914 -randroid.hardware:hardware/interfaces \
1915 -randroid.hidl:system/libhidl/transport \
1916 android.hardware.automotive.vehicle@2.0::types.VehicleAudioStream
1917
1918$(GEN): $(LOCAL_PATH)/types.hal
1919 $(transform-generated-source)
1920LOCAL_GENERATED_SOURCES += $(GEN)
1921
1922#
1923# Build types.hal (VehicleAudioStreamFlag)
1924#
1925GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAudioStreamFlag.java
1926$(GEN): $(HIDL)
1927$(GEN): PRIVATE_HIDL := $(HIDL)
1928$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
1929$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
1930$(GEN): PRIVATE_CUSTOM_TOOL = \
1931 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
1932 -Ljava \
1933 -randroid.hardware:hardware/interfaces \
1934 -randroid.hidl:system/libhidl/transport \
1935 android.hardware.automotive.vehicle@2.0::types.VehicleAudioStreamFlag
1936
1937$(GEN): $(LOCAL_PATH)/types.hal
1938 $(transform-generated-source)
1939LOCAL_GENERATED_SOURCES += $(GEN)
1940
1941#
1942# Build types.hal (VehicleAudioVolumeCapabilityFlag)
1943#
1944GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAudioVolumeCapabilityFlag.java
1945$(GEN): $(HIDL)
1946$(GEN): PRIVATE_HIDL := $(HIDL)
1947$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
1948$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
1949$(GEN): PRIVATE_CUSTOM_TOOL = \
1950 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
1951 -Ljava \
1952 -randroid.hardware:hardware/interfaces \
1953 -randroid.hidl:system/libhidl/transport \
1954 android.hardware.automotive.vehicle@2.0::types.VehicleAudioVolumeCapabilityFlag
1955
1956$(GEN): $(LOCAL_PATH)/types.hal
1957 $(transform-generated-source)
1958LOCAL_GENERATED_SOURCES += $(GEN)
1959
1960#
1961# Build types.hal (VehicleAudioVolumeIndex)
1962#
1963GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAudioVolumeIndex.java
1964$(GEN): $(HIDL)
1965$(GEN): PRIVATE_HIDL := $(HIDL)
1966$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
1967$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
1968$(GEN): PRIVATE_CUSTOM_TOOL = \
1969 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
1970 -Ljava \
1971 -randroid.hardware:hardware/interfaces \
1972 -randroid.hidl:system/libhidl/transport \
1973 android.hardware.automotive.vehicle@2.0::types.VehicleAudioVolumeIndex
1974
1975$(GEN): $(LOCAL_PATH)/types.hal
1976 $(transform-generated-source)
1977LOCAL_GENERATED_SOURCES += $(GEN)
1978
1979#
1980# Build types.hal (VehicleAudioVolumeLimitIndex)
1981#
1982GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAudioVolumeLimitIndex.java
1983$(GEN): $(HIDL)
1984$(GEN): PRIVATE_HIDL := $(HIDL)
1985$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
1986$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
1987$(GEN): PRIVATE_CUSTOM_TOOL = \
1988 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
1989 -Ljava \
1990 -randroid.hardware:hardware/interfaces \
1991 -randroid.hidl:system/libhidl/transport \
1992 android.hardware.automotive.vehicle@2.0::types.VehicleAudioVolumeLimitIndex
1993
1994$(GEN): $(LOCAL_PATH)/types.hal
1995 $(transform-generated-source)
1996LOCAL_GENERATED_SOURCES += $(GEN)
1997
1998#
1999# Build types.hal (VehicleAudioVolumeState)
2000#
2001GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleAudioVolumeState.java
2002$(GEN): $(HIDL)
2003$(GEN): PRIVATE_HIDL := $(HIDL)
2004$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
2005$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
2006$(GEN): PRIVATE_CUSTOM_TOOL = \
2007 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
2008 -Ljava \
2009 -randroid.hardware:hardware/interfaces \
2010 -randroid.hidl:system/libhidl/transport \
2011 android.hardware.automotive.vehicle@2.0::types.VehicleAudioVolumeState
2012
2013$(GEN): $(LOCAL_PATH)/types.hal
2014 $(transform-generated-source)
2015LOCAL_GENERATED_SOURCES += $(GEN)
2016
2017#
2018# Build types.hal (VehicleDisplay)
2019#
2020GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleDisplay.java
2021$(GEN): $(HIDL)
2022$(GEN): PRIVATE_HIDL := $(HIDL)
2023$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
2024$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
2025$(GEN): PRIVATE_CUSTOM_TOOL = \
2026 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
2027 -Ljava \
2028 -randroid.hardware:hardware/interfaces \
2029 -randroid.hidl:system/libhidl/transport \
2030 android.hardware.automotive.vehicle@2.0::types.VehicleDisplay
2031
2032$(GEN): $(LOCAL_PATH)/types.hal
2033 $(transform-generated-source)
2034LOCAL_GENERATED_SOURCES += $(GEN)
2035
2036#
2037# Build types.hal (VehicleDrivingStatus)
2038#
2039GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleDrivingStatus.java
2040$(GEN): $(HIDL)
2041$(GEN): PRIVATE_HIDL := $(HIDL)
2042$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
2043$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
2044$(GEN): PRIVATE_CUSTOM_TOOL = \
2045 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
2046 -Ljava \
2047 -randroid.hardware:hardware/interfaces \
2048 -randroid.hidl:system/libhidl/transport \
2049 android.hardware.automotive.vehicle@2.0::types.VehicleDrivingStatus
2050
2051$(GEN): $(LOCAL_PATH)/types.hal
2052 $(transform-generated-source)
2053LOCAL_GENERATED_SOURCES += $(GEN)
2054
2055#
2056# Build types.hal (VehicleGear)
2057#
2058GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleGear.java
2059$(GEN): $(HIDL)
2060$(GEN): PRIVATE_HIDL := $(HIDL)
2061$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
2062$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
2063$(GEN): PRIVATE_CUSTOM_TOOL = \
2064 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
2065 -Ljava \
2066 -randroid.hardware:hardware/interfaces \
2067 -randroid.hidl:system/libhidl/transport \
2068 android.hardware.automotive.vehicle@2.0::types.VehicleGear
2069
2070$(GEN): $(LOCAL_PATH)/types.hal
2071 $(transform-generated-source)
2072LOCAL_GENERATED_SOURCES += $(GEN)
2073
2074#
2075# Build types.hal (VehicleHvacFanDirection)
2076#
2077GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleHvacFanDirection.java
2078$(GEN): $(HIDL)
2079$(GEN): PRIVATE_HIDL := $(HIDL)
2080$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
2081$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
2082$(GEN): PRIVATE_CUSTOM_TOOL = \
2083 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
2084 -Ljava \
2085 -randroid.hardware:hardware/interfaces \
2086 -randroid.hidl:system/libhidl/transport \
2087 android.hardware.automotive.vehicle@2.0::types.VehicleHvacFanDirection
2088
2089$(GEN): $(LOCAL_PATH)/types.hal
2090 $(transform-generated-source)
2091LOCAL_GENERATED_SOURCES += $(GEN)
2092
2093#
2094# Build types.hal (VehicleHwKeyInputAction)
2095#
2096GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleHwKeyInputAction.java
2097$(GEN): $(HIDL)
2098$(GEN): PRIVATE_HIDL := $(HIDL)
2099$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
2100$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
2101$(GEN): PRIVATE_CUSTOM_TOOL = \
2102 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
2103 -Ljava \
2104 -randroid.hardware:hardware/interfaces \
2105 -randroid.hidl:system/libhidl/transport \
2106 android.hardware.automotive.vehicle@2.0::types.VehicleHwKeyInputAction
2107
2108$(GEN): $(LOCAL_PATH)/types.hal
2109 $(transform-generated-source)
2110LOCAL_GENERATED_SOURCES += $(GEN)
2111
2112#
2113# Build types.hal (VehicleIgnitionState)
2114#
2115GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleIgnitionState.java
2116$(GEN): $(HIDL)
2117$(GEN): PRIVATE_HIDL := $(HIDL)
2118$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
2119$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
2120$(GEN): PRIVATE_CUSTOM_TOOL = \
2121 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
2122 -Ljava \
2123 -randroid.hardware:hardware/interfaces \
2124 -randroid.hidl:system/libhidl/transport \
2125 android.hardware.automotive.vehicle@2.0::types.VehicleIgnitionState
2126
2127$(GEN): $(LOCAL_PATH)/types.hal
2128 $(transform-generated-source)
2129LOCAL_GENERATED_SOURCES += $(GEN)
2130
2131#
2132# Build types.hal (VehicleInstrumentClusterType)
2133#
2134GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleInstrumentClusterType.java
2135$(GEN): $(HIDL)
2136$(GEN): PRIVATE_HIDL := $(HIDL)
2137$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
2138$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
2139$(GEN): PRIVATE_CUSTOM_TOOL = \
2140 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
2141 -Ljava \
2142 -randroid.hardware:hardware/interfaces \
2143 -randroid.hidl:system/libhidl/transport \
2144 android.hardware.automotive.vehicle@2.0::types.VehicleInstrumentClusterType
2145
2146$(GEN): $(LOCAL_PATH)/types.hal
2147 $(transform-generated-source)
2148LOCAL_GENERATED_SOURCES += $(GEN)
2149
2150#
2151# Build types.hal (VehiclePropConfig)
2152#
2153GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehiclePropConfig.java
2154$(GEN): $(HIDL)
2155$(GEN): PRIVATE_HIDL := $(HIDL)
2156$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
2157$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
2158$(GEN): PRIVATE_CUSTOM_TOOL = \
2159 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
2160 -Ljava \
2161 -randroid.hardware:hardware/interfaces \
2162 -randroid.hidl:system/libhidl/transport \
2163 android.hardware.automotive.vehicle@2.0::types.VehiclePropConfig
2164
2165$(GEN): $(LOCAL_PATH)/types.hal
2166 $(transform-generated-source)
2167LOCAL_GENERATED_SOURCES += $(GEN)
2168
2169#
2170# Build types.hal (VehiclePropValue)
2171#
2172GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehiclePropValue.java
2173$(GEN): $(HIDL)
2174$(GEN): PRIVATE_HIDL := $(HIDL)
2175$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
2176$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
2177$(GEN): PRIVATE_CUSTOM_TOOL = \
2178 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
2179 -Ljava \
2180 -randroid.hardware:hardware/interfaces \
2181 -randroid.hidl:system/libhidl/transport \
2182 android.hardware.automotive.vehicle@2.0::types.VehiclePropValue
2183
2184$(GEN): $(LOCAL_PATH)/types.hal
2185 $(transform-generated-source)
2186LOCAL_GENERATED_SOURCES += $(GEN)
2187
2188#
2189# Build types.hal (VehicleProperty)
2190#
2191GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleProperty.java
2192$(GEN): $(HIDL)
2193$(GEN): PRIVATE_HIDL := $(HIDL)
2194$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
2195$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
2196$(GEN): PRIVATE_CUSTOM_TOOL = \
2197 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
2198 -Ljava \
2199 -randroid.hardware:hardware/interfaces \
2200 -randroid.hidl:system/libhidl/transport \
2201 android.hardware.automotive.vehicle@2.0::types.VehicleProperty
2202
2203$(GEN): $(LOCAL_PATH)/types.hal
2204 $(transform-generated-source)
2205LOCAL_GENERATED_SOURCES += $(GEN)
2206
2207#
2208# Build types.hal (VehiclePropertyAccess)
2209#
2210GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehiclePropertyAccess.java
2211$(GEN): $(HIDL)
2212$(GEN): PRIVATE_HIDL := $(HIDL)
2213$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
2214$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
2215$(GEN): PRIVATE_CUSTOM_TOOL = \
2216 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
2217 -Ljava \
2218 -randroid.hardware:hardware/interfaces \
2219 -randroid.hidl:system/libhidl/transport \
2220 android.hardware.automotive.vehicle@2.0::types.VehiclePropertyAccess
2221
2222$(GEN): $(LOCAL_PATH)/types.hal
2223 $(transform-generated-source)
2224LOCAL_GENERATED_SOURCES += $(GEN)
2225
2226#
2227# Build types.hal (VehiclePropertyChangeMode)
2228#
2229GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehiclePropertyChangeMode.java
2230$(GEN): $(HIDL)
2231$(GEN): PRIVATE_HIDL := $(HIDL)
2232$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
2233$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
2234$(GEN): PRIVATE_CUSTOM_TOOL = \
2235 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
2236 -Ljava \
2237 -randroid.hardware:hardware/interfaces \
2238 -randroid.hidl:system/libhidl/transport \
2239 android.hardware.automotive.vehicle@2.0::types.VehiclePropertyChangeMode
2240
2241$(GEN): $(LOCAL_PATH)/types.hal
2242 $(transform-generated-source)
2243LOCAL_GENERATED_SOURCES += $(GEN)
2244
2245#
2246# Build types.hal (VehiclePropertyGroup)
2247#
2248GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehiclePropertyGroup.java
2249$(GEN): $(HIDL)
2250$(GEN): PRIVATE_HIDL := $(HIDL)
2251$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
2252$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
2253$(GEN): PRIVATE_CUSTOM_TOOL = \
2254 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
2255 -Ljava \
2256 -randroid.hardware:hardware/interfaces \
2257 -randroid.hidl:system/libhidl/transport \
2258 android.hardware.automotive.vehicle@2.0::types.VehiclePropertyGroup
2259
2260$(GEN): $(LOCAL_PATH)/types.hal
2261 $(transform-generated-source)
2262LOCAL_GENERATED_SOURCES += $(GEN)
2263
2264#
2265# Build types.hal (VehiclePropertyOperation)
2266#
2267GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehiclePropertyOperation.java
2268$(GEN): $(HIDL)
2269$(GEN): PRIVATE_HIDL := $(HIDL)
2270$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
2271$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
2272$(GEN): PRIVATE_CUSTOM_TOOL = \
2273 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
2274 -Ljava \
2275 -randroid.hardware:hardware/interfaces \
2276 -randroid.hidl:system/libhidl/transport \
2277 android.hardware.automotive.vehicle@2.0::types.VehiclePropertyOperation
2278
2279$(GEN): $(LOCAL_PATH)/types.hal
2280 $(transform-generated-source)
2281LOCAL_GENERATED_SOURCES += $(GEN)
2282
2283#
2284# Build types.hal (VehiclePropertyType)
2285#
2286GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehiclePropertyType.java
2287$(GEN): $(HIDL)
2288$(GEN): PRIVATE_HIDL := $(HIDL)
2289$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
2290$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
2291$(GEN): PRIVATE_CUSTOM_TOOL = \
2292 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
2293 -Ljava \
2294 -randroid.hardware:hardware/interfaces \
2295 -randroid.hidl:system/libhidl/transport \
2296 android.hardware.automotive.vehicle@2.0::types.VehiclePropertyType
2297
2298$(GEN): $(LOCAL_PATH)/types.hal
2299 $(transform-generated-source)
2300LOCAL_GENERATED_SOURCES += $(GEN)
2301
2302#
2303# Build types.hal (VehicleRadioConstants)
2304#
2305GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleRadioConstants.java
2306$(GEN): $(HIDL)
2307$(GEN): PRIVATE_HIDL := $(HIDL)
2308$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
2309$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
2310$(GEN): PRIVATE_CUSTOM_TOOL = \
2311 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
2312 -Ljava \
2313 -randroid.hardware:hardware/interfaces \
2314 -randroid.hidl:system/libhidl/transport \
2315 android.hardware.automotive.vehicle@2.0::types.VehicleRadioConstants
2316
2317$(GEN): $(LOCAL_PATH)/types.hal
2318 $(transform-generated-source)
2319LOCAL_GENERATED_SOURCES += $(GEN)
2320
2321#
2322# Build types.hal (VehicleTurnSignal)
2323#
2324GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleTurnSignal.java
2325$(GEN): $(HIDL)
2326$(GEN): PRIVATE_HIDL := $(HIDL)
2327$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
2328$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
2329$(GEN): PRIVATE_CUSTOM_TOOL = \
2330 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
2331 -Ljava \
2332 -randroid.hardware:hardware/interfaces \
2333 -randroid.hidl:system/libhidl/transport \
2334 android.hardware.automotive.vehicle@2.0::types.VehicleTurnSignal
2335
2336$(GEN): $(LOCAL_PATH)/types.hal
2337 $(transform-generated-source)
2338LOCAL_GENERATED_SOURCES += $(GEN)
2339
2340#
2341# Build types.hal (VehicleUnit)
2342#
2343GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VehicleUnit.java
2344$(GEN): $(HIDL)
2345$(GEN): PRIVATE_HIDL := $(HIDL)
2346$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
2347$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
2348$(GEN): PRIVATE_CUSTOM_TOOL = \
2349 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
2350 -Ljava \
2351 -randroid.hardware:hardware/interfaces \
2352 -randroid.hidl:system/libhidl/transport \
2353 android.hardware.automotive.vehicle@2.0::types.VehicleUnit
2354
2355$(GEN): $(LOCAL_PATH)/types.hal
2356 $(transform-generated-source)
2357LOCAL_GENERATED_SOURCES += $(GEN)
2358
2359#
2360# Build types.hal (VmsAvailabilityStateIntegerValuesIndex)
2361#
2362GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VmsAvailabilityStateIntegerValuesIndex.java
2363$(GEN): $(HIDL)
2364$(GEN): PRIVATE_HIDL := $(HIDL)
2365$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
2366$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
2367$(GEN): PRIVATE_CUSTOM_TOOL = \
2368 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
2369 -Ljava \
2370 -randroid.hardware:hardware/interfaces \
2371 -randroid.hidl:system/libhidl/transport \
2372 android.hardware.automotive.vehicle@2.0::types.VmsAvailabilityStateIntegerValuesIndex
2373
2374$(GEN): $(LOCAL_PATH)/types.hal
2375 $(transform-generated-source)
2376LOCAL_GENERATED_SOURCES += $(GEN)
2377
2378#
2379# Build types.hal (VmsBaseMessageIntegerValuesIndex)
2380#
2381GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VmsBaseMessageIntegerValuesIndex.java
2382$(GEN): $(HIDL)
2383$(GEN): PRIVATE_HIDL := $(HIDL)
2384$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
2385$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
2386$(GEN): PRIVATE_CUSTOM_TOOL = \
2387 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
2388 -Ljava \
2389 -randroid.hardware:hardware/interfaces \
2390 -randroid.hidl:system/libhidl/transport \
2391 android.hardware.automotive.vehicle@2.0::types.VmsBaseMessageIntegerValuesIndex
2392
2393$(GEN): $(LOCAL_PATH)/types.hal
2394 $(transform-generated-source)
2395LOCAL_GENERATED_SOURCES += $(GEN)
2396
2397#
2398# Build types.hal (VmsMessageType)
2399#
2400GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VmsMessageType.java
2401$(GEN): $(HIDL)
2402$(GEN): PRIVATE_HIDL := $(HIDL)
2403$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
2404$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
2405$(GEN): PRIVATE_CUSTOM_TOOL = \
2406 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
2407 -Ljava \
2408 -randroid.hardware:hardware/interfaces \
2409 -randroid.hidl:system/libhidl/transport \
2410 android.hardware.automotive.vehicle@2.0::types.VmsMessageType
2411
2412$(GEN): $(LOCAL_PATH)/types.hal
2413 $(transform-generated-source)
2414LOCAL_GENERATED_SOURCES += $(GEN)
2415
2416#
2417# Build types.hal (VmsMessageWithLayerAndPublisherIdIntegerValuesIndex)
2418#
2419GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VmsMessageWithLayerAndPublisherIdIntegerValuesIndex.java
2420$(GEN): $(HIDL)
2421$(GEN): PRIVATE_HIDL := $(HIDL)
2422$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
2423$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
2424$(GEN): PRIVATE_CUSTOM_TOOL = \
2425 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
2426 -Ljava \
2427 -randroid.hardware:hardware/interfaces \
2428 -randroid.hidl:system/libhidl/transport \
2429 android.hardware.automotive.vehicle@2.0::types.VmsMessageWithLayerAndPublisherIdIntegerValuesIndex
2430
2431$(GEN): $(LOCAL_PATH)/types.hal
2432 $(transform-generated-source)
2433LOCAL_GENERATED_SOURCES += $(GEN)
2434
2435#
2436# Build types.hal (VmsMessageWithLayerIntegerValuesIndex)
2437#
2438GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VmsMessageWithLayerIntegerValuesIndex.java
2439$(GEN): $(HIDL)
2440$(GEN): PRIVATE_HIDL := $(HIDL)
2441$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
2442$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
2443$(GEN): PRIVATE_CUSTOM_TOOL = \
2444 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
2445 -Ljava \
2446 -randroid.hardware:hardware/interfaces \
2447 -randroid.hidl:system/libhidl/transport \
2448 android.hardware.automotive.vehicle@2.0::types.VmsMessageWithLayerIntegerValuesIndex
2449
2450$(GEN): $(LOCAL_PATH)/types.hal
2451 $(transform-generated-source)
2452LOCAL_GENERATED_SOURCES += $(GEN)
2453
2454#
2455# Build types.hal (VmsOfferingMessageIntegerValuesIndex)
2456#
2457GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VmsOfferingMessageIntegerValuesIndex.java
2458$(GEN): $(HIDL)
2459$(GEN): PRIVATE_HIDL := $(HIDL)
2460$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
2461$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
2462$(GEN): PRIVATE_CUSTOM_TOOL = \
2463 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
2464 -Ljava \
2465 -randroid.hardware:hardware/interfaces \
2466 -randroid.hidl:system/libhidl/transport \
2467 android.hardware.automotive.vehicle@2.0::types.VmsOfferingMessageIntegerValuesIndex
2468
2469$(GEN): $(LOCAL_PATH)/types.hal
2470 $(transform-generated-source)
2471LOCAL_GENERATED_SOURCES += $(GEN)
2472
2473#
2474# Build types.hal (VmsSubscriptionsStateIntegerValuesIndex)
2475#
2476GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/VmsSubscriptionsStateIntegerValuesIndex.java
2477$(GEN): $(HIDL)
2478$(GEN): PRIVATE_HIDL := $(HIDL)
2479$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
2480$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
2481$(GEN): PRIVATE_CUSTOM_TOOL = \
2482 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
2483 -Ljava \
2484 -randroid.hardware:hardware/interfaces \
2485 -randroid.hidl:system/libhidl/transport \
2486 android.hardware.automotive.vehicle@2.0::types.VmsSubscriptionsStateIntegerValuesIndex
2487
2488$(GEN): $(LOCAL_PATH)/types.hal
2489 $(transform-generated-source)
2490LOCAL_GENERATED_SOURCES += $(GEN)
2491
2492#
2493# Build types.hal (Wheel)
2494#
2495GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/Wheel.java
2496$(GEN): $(HIDL)
2497$(GEN): PRIVATE_HIDL := $(HIDL)
2498$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
2499$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
2500$(GEN): PRIVATE_CUSTOM_TOOL = \
2501 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
2502 -Ljava \
2503 -randroid.hardware:hardware/interfaces \
2504 -randroid.hidl:system/libhidl/transport \
2505 android.hardware.automotive.vehicle@2.0::types.Wheel
2506
2507$(GEN): $(LOCAL_PATH)/types.hal
2508 $(transform-generated-source)
2509LOCAL_GENERATED_SOURCES += $(GEN)
2510
2511#
2512# Build IVehicle.hal
2513#
2514GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/IVehicle.java
2515$(GEN): $(HIDL)
2516$(GEN): PRIVATE_HIDL := $(HIDL)
2517$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IVehicle.hal
2518$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/IVehicleCallback.hal
2519$(GEN): $(LOCAL_PATH)/IVehicleCallback.hal
2520$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal
2521$(GEN): $(LOCAL_PATH)/types.hal
2522$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
2523$(GEN): PRIVATE_CUSTOM_TOOL = \
2524 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
2525 -Ljava \
2526 -randroid.hardware:hardware/interfaces \
2527 -randroid.hidl:system/libhidl/transport \
2528 android.hardware.automotive.vehicle@2.0::IVehicle
2529
2530$(GEN): $(LOCAL_PATH)/IVehicle.hal
2531 $(transform-generated-source)
2532LOCAL_GENERATED_SOURCES += $(GEN)
2533
2534#
2535# Build IVehicleCallback.hal
2536#
2537GEN := $(intermediates)/android/hardware/automotive/vehicle/V2_0/IVehicleCallback.java
2538$(GEN): $(HIDL)
2539$(GEN): PRIVATE_HIDL := $(HIDL)
2540$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IVehicleCallback.hal
2541$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal
2542$(GEN): $(LOCAL_PATH)/types.hal
2543$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
2544$(GEN): PRIVATE_CUSTOM_TOOL = \
2545 $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
2546 -Ljava \
2547 -randroid.hardware:hardware/interfaces \
2548 -randroid.hidl:system/libhidl/transport \
2549 android.hardware.automotive.vehicle@2.0::IVehicleCallback
2550
2551$(GEN): $(LOCAL_PATH)/IVehicleCallback.hal
2552 $(transform-generated-source)
2553LOCAL_GENERATED_SOURCES += $(GEN)
2554include $(BUILD_STATIC_JAVA_LIBRARY)
2555
2556
2557 1283
2558include $(call all-makefiles-under,$(LOCAL_PATH)) 1284include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/automotive/vehicle/2.0/default/android.hardware.automotive.vehicle@2.0-service.rc b/automotive/vehicle/2.0/default/android.hardware.automotive.vehicle@2.0-service.rc
index 30e249e8..c8c89dc8 100644
--- a/automotive/vehicle/2.0/default/android.hardware.automotive.vehicle@2.0-service.rc
+++ b/automotive/vehicle/2.0/default/android.hardware.automotive.vehicle@2.0-service.rc
@@ -1,4 +1,4 @@
1service vehicle-hal-2.0 /vendor/bin/hw/android.hardware.automotive.vehicle@2.0-service 1service vendor.vehicle-hal-2.0 /vendor/bin/hw/android.hardware.automotive.vehicle@2.0-service
2 class hal 2 class hal
3 user vehicle_network 3 user vehicle_network
4 group system inet 4 group system inet
diff --git a/biometrics/fingerprint/2.1/default/android.hardware.biometrics.fingerprint@2.1-service.rc b/biometrics/fingerprint/2.1/default/android.hardware.biometrics.fingerprint@2.1-service.rc
index aa767a60..123d339a 100644
--- a/biometrics/fingerprint/2.1/default/android.hardware.biometrics.fingerprint@2.1-service.rc
+++ b/biometrics/fingerprint/2.1/default/android.hardware.biometrics.fingerprint@2.1-service.rc
@@ -1,4 +1,4 @@
1service fps_hal /vendor/bin/hw/android.hardware.biometrics.fingerprint@2.1-service 1service vendor.fps_hal /vendor/bin/hw/android.hardware.biometrics.fingerprint@2.1-service
2 # "class hal" causes a race condition on some devices due to files created 2 # "class hal" causes a race condition on some devices due to files created
3 # in /data. As a workaround, postpone startup until later in boot once 3 # in /data. As a workaround, postpone startup until later in boot once
4 # /data is mounted. 4 # /data is mounted.
diff --git a/bluetooth/1.0/default/android.hardware.bluetooth@1.0-service.rc b/bluetooth/1.0/default/android.hardware.bluetooth@1.0-service.rc
index 47cc13e3..e1f5faa5 100644
--- a/bluetooth/1.0/default/android.hardware.bluetooth@1.0-service.rc
+++ b/bluetooth/1.0/default/android.hardware.bluetooth@1.0-service.rc
@@ -1,14 +1,14 @@
1service bluetooth-1-0 /vendor/bin/hw/android.hardware.bluetooth@1.0-service 1service vendor.bluetooth-1-0 /vendor/bin/hw/android.hardware.bluetooth@1.0-service
2 class hal 2 class hal
3 user bluetooth 3 user bluetooth
4 group bluetooth 4 group bluetooth
5 writepid /dev/stune/foreground/tasks 5 writepid /dev/stune/foreground/tasks
6 6
7on property:vts.native_server.on=1 && property:ro.build.type=userdebug 7on property:vts.native_server.on=1 && property:ro.build.type=userdebug
8 stop bluetooth-1-0 8 stop vendor.bluetooth-1-0
9on property:vts.native_server.on=1 && property:ro.build.type=eng 9on property:vts.native_server.on=1 && property:ro.build.type=eng
10 stop bluetooth-1-0 10 stop vendor.bluetooth-1-0
11on property:vts.native_server.on=0 && property:ro.build.type=userdebug 11on property:vts.native_server.on=0 && property:ro.build.type=userdebug
12 start bluetooth-1-0 12 start vendor.bluetooth-1-0
13on property:vts.native_server.on=0 && property:ro.build.type=eng 13on property:vts.native_server.on=0 && property:ro.build.type=eng
14 start bluetooth-1-0 14 start vendor.bluetooth-1-0
diff --git a/boot/1.0/default/android.hardware.boot@1.0-service.rc b/boot/1.0/default/android.hardware.boot@1.0-service.rc
index 68e7c227..32f3a45b 100644
--- a/boot/1.0/default/android.hardware.boot@1.0-service.rc
+++ b/boot/1.0/default/android.hardware.boot@1.0-service.rc
@@ -1,4 +1,4 @@
1service boot-hal-1-0 /vendor/bin/hw/android.hardware.boot@1.0-service 1service vendor.boot-hal-1-0 /vendor/bin/hw/android.hardware.boot@1.0-service
2 class early_hal 2 class early_hal
3 user root 3 user root
4 group root 4 group root
diff --git a/broadcastradio/1.1/vts/functional/Android.bp b/broadcastradio/1.1/vts/functional/Android.bp
index 4b93cbcf..3d4fe056 100644
--- a/broadcastradio/1.1/vts/functional/Android.bp
+++ b/broadcastradio/1.1/vts/functional/Android.bp
@@ -21,8 +21,8 @@ cc_test {
21 static_libs: [ 21 static_libs: [
22 "android.hardware.broadcastradio@1.0", 22 "android.hardware.broadcastradio@1.0",
23 "android.hardware.broadcastradio@1.1", 23 "android.hardware.broadcastradio@1.1",
24 "android.hardware.broadcastradio@1.1-utils-lib", 24 "android.hardware.broadcastradio@common-utils-lib",
25 "android.hardware.broadcastradio@1.1-vts-utils-lib", 25 "android.hardware.broadcastradio@vts-utils-lib",
26 "libgmock", 26 "libgmock",
27 ], 27 ],
28} 28}
diff --git a/broadcastradio/1.2/Android.bp b/broadcastradio/1.2/Android.bp
new file mode 100644
index 00000000..44136c8a
--- /dev/null
+++ b/broadcastradio/1.2/Android.bp
@@ -0,0 +1,84 @@
1// This file is autogenerated by hidl-gen. Do not edit manually.
2
3filegroup {
4 name: "android.hardware.broadcastradio@1.2_hal",
5 srcs: [
6 "types.hal",
7 "IBroadcastRadioFactory.hal",
8 "ITuner.hal",
9 "ITunerCallback.hal",
10 ],
11}
12
13genrule {
14 name: "android.hardware.broadcastradio@1.2_genc++",
15 tools: ["hidl-gen"],
16 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.broadcastradio@1.2",
17 srcs: [
18 ":android.hardware.broadcastradio@1.2_hal",
19 ],
20 out: [
21 "android/hardware/broadcastradio/1.2/types.cpp",
22 "android/hardware/broadcastradio/1.2/BroadcastRadioFactoryAll.cpp",
23 "android/hardware/broadcastradio/1.2/TunerAll.cpp",
24 "android/hardware/broadcastradio/1.2/TunerCallbackAll.cpp",
25 ],
26}
27
28genrule {
29 name: "android.hardware.broadcastradio@1.2_genc++_headers",
30 tools: ["hidl-gen"],
31 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.broadcastradio@1.2",
32 srcs: [
33 ":android.hardware.broadcastradio@1.2_hal",
34 ],
35 out: [
36 "android/hardware/broadcastradio/1.2/types.h",
37 "android/hardware/broadcastradio/1.2/hwtypes.h",
38 "android/hardware/broadcastradio/1.2/IBroadcastRadioFactory.h",
39 "android/hardware/broadcastradio/1.2/IHwBroadcastRadioFactory.h",
40 "android/hardware/broadcastradio/1.2/BnHwBroadcastRadioFactory.h",
41 "android/hardware/broadcastradio/1.2/BpHwBroadcastRadioFactory.h",
42 "android/hardware/broadcastradio/1.2/BsBroadcastRadioFactory.h",
43 "android/hardware/broadcastradio/1.2/ITuner.h",
44 "android/hardware/broadcastradio/1.2/IHwTuner.h",
45 "android/hardware/broadcastradio/1.2/BnHwTuner.h",
46 "android/hardware/broadcastradio/1.2/BpHwTuner.h",
47 "android/hardware/broadcastradio/1.2/BsTuner.h",
48 "android/hardware/broadcastradio/1.2/ITunerCallback.h",
49 "android/hardware/broadcastradio/1.2/IHwTunerCallback.h",
50 "android/hardware/broadcastradio/1.2/BnHwTunerCallback.h",
51 "android/hardware/broadcastradio/1.2/BpHwTunerCallback.h",
52 "android/hardware/broadcastradio/1.2/BsTunerCallback.h",
53 ],
54}
55
56cc_library {
57 name: "android.hardware.broadcastradio@1.2",
58 defaults: ["hidl-module-defaults"],
59 generated_sources: ["android.hardware.broadcastradio@1.2_genc++"],
60 generated_headers: ["android.hardware.broadcastradio@1.2_genc++_headers"],
61 export_generated_headers: ["android.hardware.broadcastradio@1.2_genc++_headers"],
62 vendor_available: true,
63 vndk: {
64 enabled: true,
65 },
66 shared_libs: [
67 "libhidlbase",
68 "libhidltransport",
69 "libhwbinder",
70 "liblog",
71 "libutils",
72 "libcutils",
73 "android.hardware.broadcastradio@1.0",
74 "android.hardware.broadcastradio@1.1",
75 ],
76 export_shared_lib_headers: [
77 "libhidlbase",
78 "libhidltransport",
79 "libhwbinder",
80 "libutils",
81 "android.hardware.broadcastradio@1.0",
82 "android.hardware.broadcastradio@1.1",
83 ],
84}
diff --git a/broadcastradio/1.2/IBroadcastRadioFactory.hal b/broadcastradio/1.2/IBroadcastRadioFactory.hal
new file mode 100644
index 00000000..29f6ab35
--- /dev/null
+++ b/broadcastradio/1.2/IBroadcastRadioFactory.hal
@@ -0,0 +1,29 @@
1/*
2 * Copyright (C) 2017 The Android Open Source Project
3 *
4 * Licensed under the Apache License, Version 2.0 (the "License");
5 * you may not use this file except in compliance with the License.
6 * You may obtain a copy of the License at
7 *
8 * http://www.apache.org/licenses/LICENSE-2.0
9 *
10 * Unless required by applicable law or agreed to in writing, software
11 * distributed under the License is distributed on an "AS IS" BASIS,
12 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 * See the License for the specific language governing permissions and
14 * limitations under the License.
15 */
16
17package android.hardware.broadcastradio@1.2;
18
19import @1.1::IBroadcastRadioFactory;
20
21/**
22 * To use 1.2 features you must cast specific interfaces returned from the
23 * 1.0 HAL. For example V1_0::IBroadcastRadio::openTuner() returns V1_0::ITuner,
24 * which can be cast with V1_2::ITuner::castFrom() call.
25 *
26 * The 1.2 server must always return the 1.2 version of specific interface.
27 */
28interface IBroadcastRadioFactory extends @1.1::IBroadcastRadioFactory {
29};
diff --git a/broadcastradio/1.2/ITuner.hal b/broadcastradio/1.2/ITuner.hal
new file mode 100644
index 00000000..cc966fcb
--- /dev/null
+++ b/broadcastradio/1.2/ITuner.hal
@@ -0,0 +1,68 @@
1/*
2 * Copyright (C) 2017 The Android Open Source Project
3 *
4 * Licensed under the Apache License, Version 2.0 (the "License");
5 * you may not use this file except in compliance with the License.
6 * You may obtain a copy of the License at
7 *
8 * http://www.apache.org/licenses/LICENSE-2.0
9 *
10 * Unless required by applicable law or agreed to in writing, software
11 * distributed under the License is distributed on an "AS IS" BASIS,
12 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 * See the License for the specific language governing permissions and
14 * limitations under the License.
15 */
16
17package android.hardware.broadcastradio@1.2;
18
19import @1.1::ITuner;
20
21interface ITuner extends @1.1::ITuner {
22 /**
23 * Generic method for setting vendor-specific parameter values.
24 * The framework does not interpret the parameters, they are passed
25 * in an opaque manner between a vendor application and HAL.
26 *
27 * Framework does not make any assumptions on the keys or values, other than
28 * ones stated in VendorKeyValue documentation (a requirement of key
29 * prefixes).
30 *
31 * Results vector may not contain a result for each parameter being set,
32 * it can even be empty.
33 *
34 * Application and HAL must not use keys with unknown prefix. In particular,
35 * it must not place a key-value pair in results vector for unknown key from
36 * parameters vector - instead, an unknown key should simply be ignored.
37 * In other words, results vector may contain a subset of parameter keys
38 * (however, the framework doesn't enforce a strict subset - the only
39 * formal requirement is vendor domain prefix for keys).
40 *
41 * @param parameters Vendor-specific key-value pairs.
42 * @return results Operation completion status for parameters being set.
43 * Value format for result status is vendor-specific.
44 */
45 setParameters(vec<VendorKeyValue> parameters)
46 generates (vec<VendorKeyValue> results);
47
48 /**
49 * Generic method for retrieving vendor-specific parameter values.
50 * The framework does not interpret the parameters, they are passed
51 * in an opaque manner between a vendor application and HAL.
52 *
53 * Framework does not cache set/get requests, so it's allowed for
54 * getParameter to return a different value than previous setParameter call.
55 *
56 * The syntax and semantics of keys are up to the vendor (as long as prefix
57 * rules are obeyed). For instance, vendors may include some form of
58 * wildcard support. In such case, result vector may be of different size
59 * than requested keys vector. However, wildcards are not recognized by
60 * framework and they are passed as-is to the HAL implementation.
61 *
62 * Unknown keys must be ignored and not placed into results vector.
63 *
64 * @param keys Parameter keys to fetch.
65 * @return parameters Vendor-specific key-value pairs.
66 */
67 getParameters(vec<string> keys) generates (vec<VendorKeyValue> parameters);
68};
diff --git a/broadcastradio/1.2/ITunerCallback.hal b/broadcastradio/1.2/ITunerCallback.hal
new file mode 100644
index 00000000..4e3d0a56
--- /dev/null
+++ b/broadcastradio/1.2/ITunerCallback.hal
@@ -0,0 +1,36 @@
1/*
2 * Copyright (C) 2017 The Android Open Source Project
3 *
4 * Licensed under the Apache License, Version 2.0 (the "License");
5 * you may not use this file except in compliance with the License.
6 * You may obtain a copy of the License at
7 *
8 * http://www.apache.org/licenses/LICENSE-2.0
9 *
10 * Unless required by applicable law or agreed to in writing, software
11 * distributed under the License is distributed on an "AS IS" BASIS,
12 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 * See the License for the specific language governing permissions and
14 * limitations under the License.
15 */
16
17package android.hardware.broadcastradio@1.2;
18
19import @1.1::ITunerCallback;
20
21interface ITunerCallback extends @1.1::ITunerCallback {
22 /**
23 * Generic callback for passing updates to vendor-specific parameter values.
24 * The framework does not interpret the parameters, they are passed
25 * in an opaque manner between a vendor application and HAL.
26 *
27 * It's up to the HAL implementation if and how to implement this callback,
28 * as long as it obeys the prefix rule. In particular, only selected keys
29 * may be notified this way. However, setParameters must not trigger
30 * this callback, while an internal event can change parameters
31 * asynchronously.
32 *
33 * @param parameters Vendor-specific key-value pairs.
34 */
35 oneway parametersUpdated(vec<VendorKeyValue> parameters);
36};
diff --git a/broadcastradio/1.1/default/Android.bp b/broadcastradio/1.2/default/Android.bp
index 6d26b11b..e42cb1e7 100644
--- a/broadcastradio/1.1/default/Android.bp
+++ b/broadcastradio/1.2/default/Android.bp
@@ -15,8 +15,8 @@
15// 15//
16 16
17cc_binary { 17cc_binary {
18 name: "android.hardware.broadcastradio@1.1-service", 18 name: "android.hardware.broadcastradio@1.2-service",
19 init_rc: ["android.hardware.broadcastradio@1.1-service.rc"], 19 init_rc: ["android.hardware.broadcastradio@1.2-service.rc"],
20 vendor: true, 20 vendor: true,
21 relative_install_path: "hw", 21 relative_install_path: "hw",
22 cflags: [ 22 cflags: [
@@ -33,11 +33,12 @@ cc_binary {
33 "service.cpp" 33 "service.cpp"
34 ], 34 ],
35 static_libs: [ 35 static_libs: [
36 "android.hardware.broadcastradio@1.1-utils-lib", 36 "android.hardware.broadcastradio@common-utils-lib",
37 ], 37 ],
38 shared_libs: [ 38 shared_libs: [
39 "android.hardware.broadcastradio@1.0", 39 "android.hardware.broadcastradio@1.0",
40 "android.hardware.broadcastradio@1.1", 40 "android.hardware.broadcastradio@1.1",
41 "android.hardware.broadcastradio@1.2",
41 "libbase", 42 "libbase",
42 "libhidlbase", 43 "libhidlbase",
43 "libhidltransport", 44 "libhidltransport",
diff --git a/broadcastradio/1.1/default/BroadcastRadio.cpp b/broadcastradio/1.2/default/BroadcastRadio.cpp
index 1bcfd824..5164e473 100644
--- a/broadcastradio/1.1/default/BroadcastRadio.cpp
+++ b/broadcastradio/1.2/default/BroadcastRadio.cpp
@@ -25,7 +25,7 @@
25namespace android { 25namespace android {
26namespace hardware { 26namespace hardware {
27namespace broadcastradio { 27namespace broadcastradio {
28namespace V1_1 { 28namespace V1_2 {
29namespace implementation { 29namespace implementation {
30 30
31using V1_0::Band; 31using V1_0::Band;
@@ -33,6 +33,11 @@ using V1_0::BandConfig;
33using V1_0::Class; 33using V1_0::Class;
34using V1_0::Deemphasis; 34using V1_0::Deemphasis;
35using V1_0::Rds; 35using V1_0::Rds;
36using V1_1::IdentifierType;
37using V1_1::ProgramSelector;
38using V1_1::ProgramType;
39using V1_1::Properties;
40using V1_1::VendorKeyValue;
36 41
37using std::lock_guard; 42using std::lock_guard;
38using std::map; 43using std::map;
@@ -185,7 +190,7 @@ Return<void> BroadcastRadio::getImage(int32_t id, getImage_cb _hidl_cb) {
185} 190}
186 191
187} // namespace implementation 192} // namespace implementation
188} // namespace V1_1 193} // namespace V1_2
189} // namespace broadcastradio 194} // namespace broadcastradio
190} // namespace hardware 195} // namespace hardware
191} // namespace android 196} // namespace android
diff --git a/broadcastradio/1.1/default/BroadcastRadio.h b/broadcastradio/1.2/default/BroadcastRadio.h
index a96a2ab9..94d62b9b 100644
--- a/broadcastradio/1.1/default/BroadcastRadio.h
+++ b/broadcastradio/1.2/default/BroadcastRadio.h
@@ -13,18 +13,18 @@
13 * See the License for the specific language governing permissions and 13 * See the License for the specific language governing permissions and
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16#ifndef ANDROID_HARDWARE_BROADCASTRADIO_V1_1_BROADCASTRADIO_H 16#ifndef ANDROID_HARDWARE_BROADCASTRADIO_V1_2_BROADCASTRADIO_H
17#define ANDROID_HARDWARE_BROADCASTRADIO_V1_1_BROADCASTRADIO_H 17#define ANDROID_HARDWARE_BROADCASTRADIO_V1_2_BROADCASTRADIO_H
18 18
19#include "Tuner.h" 19#include "Tuner.h"
20 20
21#include <android/hardware/broadcastradio/1.1/IBroadcastRadio.h> 21#include <android/hardware/broadcastradio/1.1/IBroadcastRadio.h>
22#include <android/hardware/broadcastradio/1.1/types.h> 22#include <android/hardware/broadcastradio/1.2/types.h>
23 23
24namespace android { 24namespace android {
25namespace hardware { 25namespace hardware {
26namespace broadcastradio { 26namespace broadcastradio {
27namespace V1_1 { 27namespace V1_2 {
28namespace implementation { 28namespace implementation {
29 29
30struct AmFmBandConfig { 30struct AmFmBandConfig {
@@ -73,9 +73,9 @@ struct BroadcastRadio : public V1_1::IBroadcastRadio {
73}; 73};
74 74
75} // namespace implementation 75} // namespace implementation
76} // namespace V1_1 76} // namespace V1_2
77} // namespace broadcastradio 77} // namespace broadcastradio
78} // namespace hardware 78} // namespace hardware
79} // namespace android 79} // namespace android
80 80
81#endif // ANDROID_HARDWARE_BROADCASTRADIO_V1_1_BROADCASTRADIO_H 81#endif // ANDROID_HARDWARE_BROADCASTRADIO_V1_2_BROADCASTRADIO_H
diff --git a/broadcastradio/1.1/default/BroadcastRadioFactory.cpp b/broadcastradio/1.2/default/BroadcastRadioFactory.cpp
index f57bc79f..8f17aff7 100644
--- a/broadcastradio/1.1/default/BroadcastRadioFactory.cpp
+++ b/broadcastradio/1.2/default/BroadcastRadioFactory.cpp
@@ -25,7 +25,7 @@
25namespace android { 25namespace android {
26namespace hardware { 26namespace hardware {
27namespace broadcastradio { 27namespace broadcastradio {
28namespace V1_1 { 28namespace V1_2 {
29namespace implementation { 29namespace implementation {
30 30
31using V1_0::Class; 31using V1_0::Class;
@@ -36,10 +36,6 @@ static const vector<Class> gAllClasses = {
36 Class::AM_FM, Class::SAT, Class::DT, 36 Class::AM_FM, Class::SAT, Class::DT,
37}; 37};
38 38
39IBroadcastRadioFactory* HIDL_FETCH_IBroadcastRadioFactory(const char* name __unused) {
40 return new BroadcastRadioFactory();
41}
42
43BroadcastRadioFactory::BroadcastRadioFactory() { 39BroadcastRadioFactory::BroadcastRadioFactory() {
44 for (auto&& classId : gAllClasses) { 40 for (auto&& classId : gAllClasses) {
45 if (!BroadcastRadio::isSupported(classId)) continue; 41 if (!BroadcastRadio::isSupported(classId)) continue;
@@ -61,7 +57,7 @@ Return<void> BroadcastRadioFactory::connectModule(Class classId, connectModule_c
61} 57}
62 58
63} // namespace implementation 59} // namespace implementation
64} // namespace V1_1 60} // namespace V1_2
65} // namespace broadcastradio 61} // namespace broadcastradio
66} // namespace hardware 62} // namespace hardware
67} // namespace android 63} // namespace android
diff --git a/broadcastradio/1.1/default/BroadcastRadioFactory.h b/broadcastradio/1.2/default/BroadcastRadioFactory.h
index 8b67ac36..c365ae0b 100644
--- a/broadcastradio/1.1/default/BroadcastRadioFactory.h
+++ b/broadcastradio/1.2/default/BroadcastRadioFactory.h
@@ -13,21 +13,19 @@
13 * See the License for the specific language governing permissions and 13 * See the License for the specific language governing permissions and
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16#ifndef ANDROID_HARDWARE_BROADCASTRADIO_V1_1_BROADCASTRADIOFACTORY_H 16#ifndef ANDROID_HARDWARE_BROADCASTRADIO_V1_2_BROADCASTRADIOFACTORY_H
17#define ANDROID_HARDWARE_BROADCASTRADIO_V1_1_BROADCASTRADIOFACTORY_H 17#define ANDROID_HARDWARE_BROADCASTRADIO_V1_2_BROADCASTRADIOFACTORY_H
18 18
19#include <android/hardware/broadcastradio/1.1/IBroadcastRadio.h> 19#include <android/hardware/broadcastradio/1.1/IBroadcastRadio.h>
20#include <android/hardware/broadcastradio/1.1/IBroadcastRadioFactory.h> 20#include <android/hardware/broadcastradio/1.2/IBroadcastRadioFactory.h>
21#include <android/hardware/broadcastradio/1.1/types.h> 21#include <android/hardware/broadcastradio/1.2/types.h>
22 22
23namespace android { 23namespace android {
24namespace hardware { 24namespace hardware {
25namespace broadcastradio { 25namespace broadcastradio {
26namespace V1_1 { 26namespace V1_2 {
27namespace implementation { 27namespace implementation {
28 28
29extern "C" IBroadcastRadioFactory* HIDL_FETCH_IBroadcastRadioFactory(const char* name);
30
31struct BroadcastRadioFactory : public IBroadcastRadioFactory { 29struct BroadcastRadioFactory : public IBroadcastRadioFactory {
32 BroadcastRadioFactory(); 30 BroadcastRadioFactory();
33 31
@@ -35,13 +33,13 @@ struct BroadcastRadioFactory : public IBroadcastRadioFactory {
35 Return<void> connectModule(V1_0::Class classId, connectModule_cb _hidl_cb) override; 33 Return<void> connectModule(V1_0::Class classId, connectModule_cb _hidl_cb) override;
36 34
37 private: 35 private:
38 std::map<V1_0::Class, sp<IBroadcastRadio>> mRadioModules; 36 std::map<V1_0::Class, sp<V1_1::IBroadcastRadio>> mRadioModules;
39}; 37};
40 38
41} // namespace implementation 39} // namespace implementation
42} // namespace V1_1 40} // namespace V1_2
43} // namespace broadcastradio 41} // namespace broadcastradio
44} // namespace hardware 42} // namespace hardware
45} // namespace android 43} // namespace android
46 44
47#endif // ANDROID_HARDWARE_BROADCASTRADIO_V1_1_BROADCASTRADIOFACTORY_H 45#endif // ANDROID_HARDWARE_BROADCASTRADIO_V1_2_BROADCASTRADIOFACTORY_H
diff --git a/broadcastradio/1.1/default/OWNERS b/broadcastradio/1.2/default/OWNERS
index 0c27b718..136b607b 100644
--- a/broadcastradio/1.1/default/OWNERS
+++ b/broadcastradio/1.2/default/OWNERS
@@ -1,4 +1,3 @@
1# Automotive team 1# Automotive team
2egranata@google.com 2egranata@google.com
3keunyoung@google.com
4twasilczyk@google.com 3twasilczyk@google.com
diff --git a/broadcastradio/1.1/default/Tuner.cpp b/broadcastradio/1.2/default/Tuner.cpp
index 9a34cb12..70418cfb 100644
--- a/broadcastradio/1.1/default/Tuner.cpp
+++ b/broadcastradio/1.2/default/Tuner.cpp
@@ -26,7 +26,7 @@
26namespace android { 26namespace android {
27namespace hardware { 27namespace hardware {
28namespace broadcastradio { 28namespace broadcastradio {
29namespace V1_1 { 29namespace V1_2 {
30namespace implementation { 30namespace implementation {
31 31
32using namespace std::chrono_literals; 32using namespace std::chrono_literals;
@@ -35,6 +35,13 @@ using V1_0::Band;
35using V1_0::BandConfig; 35using V1_0::BandConfig;
36using V1_0::Class; 36using V1_0::Class;
37using V1_0::Direction; 37using V1_0::Direction;
38using V1_1::IdentifierType;
39using V1_1::ProgramInfo;
40using V1_1::ProgramInfoFlags;
41using V1_1::ProgramListResult;
42using V1_1::ProgramSelector;
43using V1_1::ProgramType;
44using V1_1::VendorKeyValue;
38using utils::HalRevision; 45using utils::HalRevision;
39 46
40using std::chrono::milliseconds; 47using std::chrono::milliseconds;
@@ -54,7 +61,8 @@ const struct {
54Tuner::Tuner(V1_0::Class classId, const sp<V1_0::ITunerCallback>& callback) 61Tuner::Tuner(V1_0::Class classId, const sp<V1_0::ITunerCallback>& callback)
55 : mClassId(classId), 62 : mClassId(classId),
56 mCallback(callback), 63 mCallback(callback),
57 mCallback1_1(ITunerCallback::castFrom(callback).withDefault(nullptr)), 64 mCallback1_1(V1_1::ITunerCallback::castFrom(callback).withDefault(nullptr)),
65 mCallback1_2(V1_2::ITunerCallback::castFrom(callback).withDefault(nullptr)),
58 mVirtualRadio(getRadio(classId)), 66 mVirtualRadio(getRadio(classId)),
59 mIsAnalogForced(false) {} 67 mIsAnalogForced(false) {}
60 68
@@ -122,7 +130,9 @@ static ProgramInfo makeDummyProgramInfo(const ProgramSelector& selector) {
122} 130}
123 131
124HalRevision Tuner::getHalRev() const { 132HalRevision Tuner::getHalRev() const {
125 if (mCallback1_1 != nullptr) { 133 if (mCallback1_2 != nullptr) {
134 return HalRevision::V1_2;
135 } else if (mCallback1_1 != nullptr) {
126 return HalRevision::V1_1; 136 return HalRevision::V1_1;
127 } else { 137 } else {
128 return HalRevision::V1_0; 138 return HalRevision::V1_0;
@@ -310,9 +320,8 @@ Return<Result> Tuner::cancelAnnouncement() {
310 320
311Return<void> Tuner::getProgramInformation(getProgramInformation_cb _hidl_cb) { 321Return<void> Tuner::getProgramInformation(getProgramInformation_cb _hidl_cb) {
312 ALOGV("%s", __func__); 322 ALOGV("%s", __func__);
313 return getProgramInformation_1_1([&](Result result, const ProgramInfo& info) { 323 return getProgramInformation_1_1(
314 _hidl_cb(result, info.base); 324 [&](Result result, const ProgramInfo& info) { _hidl_cb(result, info.base); });
315 });
316} 325}
317 326
318Return<void> Tuner::getProgramInformation_1_1(getProgramInformation_1_1_cb _hidl_cb) { 327Return<void> Tuner::getProgramInformation_1_1(getProgramInformation_1_1_cb _hidl_cb) {
@@ -373,8 +382,24 @@ Return<void> Tuner::isAnalogForced(isAnalogForced_cb _hidl_cb) {
373 return {}; 382 return {};
374} 383}
375 384
385Return<void> Tuner::setParameters(const hidl_vec<VendorKeyValue>& /* parameters */,
386 setParameters_cb _hidl_cb) {
387 ALOGV("%s", __func__);
388
389 _hidl_cb({});
390 return {};
391}
392
393Return<void> Tuner::getParameters(const hidl_vec<hidl_string>& /* keys */,
394 getParameters_cb _hidl_cb) {
395 ALOGV("%s", __func__);
396
397 _hidl_cb({});
398 return {};
399}
400
376} // namespace implementation 401} // namespace implementation
377} // namespace V1_1 402} // namespace V1_2
378} // namespace broadcastradio 403} // namespace broadcastradio
379} // namespace hardware 404} // namespace hardware
380} // namespace android 405} // namespace android
diff --git a/broadcastradio/1.1/default/Tuner.h b/broadcastradio/1.2/default/Tuner.h
index 07d31898..7e683545 100644
--- a/broadcastradio/1.1/default/Tuner.h
+++ b/broadcastradio/1.2/default/Tuner.h
@@ -13,19 +13,19 @@
13 * See the License for the specific language governing permissions and 13 * See the License for the specific language governing permissions and
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16#ifndef ANDROID_HARDWARE_BROADCASTRADIO_V1_1_TUNER_H 16#ifndef ANDROID_HARDWARE_BROADCASTRADIO_V1_2_TUNER_H
17#define ANDROID_HARDWARE_BROADCASTRADIO_V1_1_TUNER_H 17#define ANDROID_HARDWARE_BROADCASTRADIO_V1_2_TUNER_H
18 18
19#include "VirtualRadio.h" 19#include "VirtualRadio.h"
20 20
21#include <android/hardware/broadcastradio/1.1/ITuner.h> 21#include <android/hardware/broadcastradio/1.2/ITuner.h>
22#include <android/hardware/broadcastradio/1.1/ITunerCallback.h> 22#include <android/hardware/broadcastradio/1.2/ITunerCallback.h>
23#include <broadcastradio-utils/WorkerThread.h> 23#include <broadcastradio-utils/WorkerThread.h>
24 24
25namespace android { 25namespace android {
26namespace hardware { 26namespace hardware {
27namespace broadcastradio { 27namespace broadcastradio {
28namespace V1_1 { 28namespace V1_2 {
29namespace implementation { 29namespace implementation {
30 30
31struct Tuner : public ITuner { 31struct Tuner : public ITuner {
@@ -33,22 +33,26 @@ struct Tuner : public ITuner {
33 33
34 void forceClose(); 34 void forceClose();
35 35
36 // V1_1::ITuner methods 36 // V1_2::ITuner methods
37 virtual Return<Result> setConfiguration(const V1_0::BandConfig& config) override; 37 virtual Return<Result> setConfiguration(const V1_0::BandConfig& config) override;
38 virtual Return<void> getConfiguration(getConfiguration_cb _hidl_cb) override; 38 virtual Return<void> getConfiguration(getConfiguration_cb _hidl_cb) override;
39 virtual Return<Result> scan(V1_0::Direction direction, bool skipSubChannel) override; 39 virtual Return<Result> scan(V1_0::Direction direction, bool skipSubChannel) override;
40 virtual Return<Result> step(V1_0::Direction direction, bool skipSubChannel) override; 40 virtual Return<Result> step(V1_0::Direction direction, bool skipSubChannel) override;
41 virtual Return<Result> tune(uint32_t channel, uint32_t subChannel) override; 41 virtual Return<Result> tune(uint32_t channel, uint32_t subChannel) override;
42 virtual Return<Result> tuneByProgramSelector(const ProgramSelector& program) override; 42 virtual Return<Result> tuneByProgramSelector(const V1_1::ProgramSelector& program) override;
43 virtual Return<Result> cancel() override; 43 virtual Return<Result> cancel() override;
44 virtual Return<Result> cancelAnnouncement() override; 44 virtual Return<Result> cancelAnnouncement() override;
45 virtual Return<void> getProgramInformation(getProgramInformation_cb _hidl_cb) override; 45 virtual Return<void> getProgramInformation(getProgramInformation_cb _hidl_cb) override;
46 virtual Return<void> getProgramInformation_1_1(getProgramInformation_1_1_cb _hidl_cb) override; 46 virtual Return<void> getProgramInformation_1_1(getProgramInformation_1_1_cb _hidl_cb) override;
47 virtual Return<ProgramListResult> startBackgroundScan() override; 47 virtual Return<V1_1::ProgramListResult> startBackgroundScan() override;
48 virtual Return<void> getProgramList(const hidl_vec<VendorKeyValue>& filter, 48 virtual Return<void> getProgramList(const hidl_vec<V1_1::VendorKeyValue>& filter,
49 getProgramList_cb _hidl_cb) override; 49 getProgramList_cb _hidl_cb) override;
50 virtual Return<Result> setAnalogForced(bool isForced) override; 50 virtual Return<Result> setAnalogForced(bool isForced) override;
51 virtual Return<void> isAnalogForced(isAnalogForced_cb _hidl_cb) override; 51 virtual Return<void> isAnalogForced(isAnalogForced_cb _hidl_cb) override;
52 virtual Return<void> setParameters(const hidl_vec<V1_1::VendorKeyValue>& parameters,
53 setParameters_cb _hidl_cb) override;
54 virtual Return<void> getParameters(const hidl_vec<hidl_string>& keys,
55 getParameters_cb _hidl_cb) override;
52 56
53 private: 57 private:
54 std::mutex mMut; 58 std::mutex mMut;
@@ -58,23 +62,24 @@ struct Tuner : public ITuner {
58 V1_0::Class mClassId; 62 V1_0::Class mClassId;
59 const sp<V1_0::ITunerCallback> mCallback; 63 const sp<V1_0::ITunerCallback> mCallback;
60 const sp<V1_1::ITunerCallback> mCallback1_1; 64 const sp<V1_1::ITunerCallback> mCallback1_1;
65 const sp<V1_2::ITunerCallback> mCallback1_2;
61 66
62 std::reference_wrapper<VirtualRadio> mVirtualRadio; 67 std::reference_wrapper<VirtualRadio> mVirtualRadio;
63 bool mIsAmfmConfigSet = false; 68 bool mIsAmfmConfigSet = false;
64 V1_0::BandConfig mAmfmConfig; 69 V1_0::BandConfig mAmfmConfig;
65 bool mIsTuneCompleted = false; 70 bool mIsTuneCompleted = false;
66 ProgramSelector mCurrentProgram = {}; 71 V1_1::ProgramSelector mCurrentProgram = {};
67 ProgramInfo mCurrentProgramInfo = {}; 72 V1_1::ProgramInfo mCurrentProgramInfo = {};
68 std::atomic<bool> mIsAnalogForced; 73 std::atomic<bool> mIsAnalogForced;
69 74
70 utils::HalRevision getHalRev() const; 75 utils::HalRevision getHalRev() const;
71 void tuneInternalLocked(const ProgramSelector& sel); 76 void tuneInternalLocked(const V1_1::ProgramSelector& sel);
72}; 77};
73 78
74} // namespace implementation 79} // namespace implementation
75} // namespace V1_1 80} // namespace V1_2
76} // namespace broadcastradio 81} // namespace broadcastradio
77} // namespace hardware 82} // namespace hardware
78} // namespace android 83} // namespace android
79 84
80#endif // ANDROID_HARDWARE_BROADCASTRADIO_V1_1_TUNER_H 85#endif // ANDROID_HARDWARE_BROADCASTRADIO_V1_2_TUNER_H
diff --git a/broadcastradio/1.1/default/VirtualProgram.cpp b/broadcastradio/1.2/default/VirtualProgram.cpp
index 7977391c..95879e34 100644
--- a/broadcastradio/1.1/default/VirtualProgram.cpp
+++ b/broadcastradio/1.2/default/VirtualProgram.cpp
@@ -22,7 +22,7 @@
22namespace android { 22namespace android {
23namespace hardware { 23namespace hardware {
24namespace broadcastradio { 24namespace broadcastradio {
25namespace V1_1 { 25namespace V1_2 {
26namespace implementation { 26namespace implementation {
27 27
28using std::vector; 28using std::vector;
@@ -30,6 +30,9 @@ using std::vector;
30using V1_0::MetaData; 30using V1_0::MetaData;
31using V1_0::MetadataKey; 31using V1_0::MetadataKey;
32using V1_0::MetadataType; 32using V1_0::MetadataType;
33using V1_1::IdentifierType;
34using V1_1::ProgramInfo;
35using V1_1::VendorKeyValue;
33using utils::HalRevision; 36using utils::HalRevision;
34 37
35static MetaData createDemoBitmap(MetadataKey key, HalRevision halRev) { 38static MetaData createDemoBitmap(MetadataKey key, HalRevision halRev) {
@@ -100,7 +103,7 @@ vector<ProgramInfo> getProgramInfoVector(const vector<VirtualProgram>& vec, HalR
100} 103}
101 104
102} // namespace implementation 105} // namespace implementation
103} // namespace V1_1 106} // namespace V1_2
104} // namespace broadcastradio 107} // namespace broadcastradio
105} // namespace hardware 108} // namespace hardware
106} // namespace android 109} // namespace android
diff --git a/broadcastradio/1.1/default/VirtualProgram.h b/broadcastradio/1.2/default/VirtualProgram.h
index a14830d7..5342c848 100644
--- a/broadcastradio/1.1/default/VirtualProgram.h
+++ b/broadcastradio/1.2/default/VirtualProgram.h
@@ -13,16 +13,16 @@
13 * See the License for the specific language governing permissions and 13 * See the License for the specific language governing permissions and
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16#ifndef ANDROID_HARDWARE_BROADCASTRADIO_V1_1_VIRTUALPROGRAM_H 16#ifndef ANDROID_HARDWARE_BROADCASTRADIO_V1_2_VIRTUALPROGRAM_H
17#define ANDROID_HARDWARE_BROADCASTRADIO_V1_1_VIRTUALPROGRAM_H 17#define ANDROID_HARDWARE_BROADCASTRADIO_V1_2_VIRTUALPROGRAM_H
18 18
19#include <android/hardware/broadcastradio/1.1/types.h> 19#include <android/hardware/broadcastradio/1.2/types.h>
20#include <broadcastradio-utils/Utils.h> 20#include <broadcastradio-utils/Utils.h>
21 21
22namespace android { 22namespace android {
23namespace hardware { 23namespace hardware {
24namespace broadcastradio { 24namespace broadcastradio {
25namespace V1_1 { 25namespace V1_2 {
26namespace implementation { 26namespace implementation {
27 27
28/** 28/**
@@ -32,24 +32,24 @@ namespace implementation {
32 * not an entry for a captured station in the radio tuner memory. 32 * not an entry for a captured station in the radio tuner memory.
33 */ 33 */
34struct VirtualProgram { 34struct VirtualProgram {
35 ProgramSelector selector; 35 V1_1::ProgramSelector selector;
36 36
37 std::string programName = ""; 37 std::string programName = "";
38 std::string songArtist = ""; 38 std::string songArtist = "";
39 std::string songTitle = ""; 39 std::string songTitle = "";
40 40
41 ProgramInfo getProgramInfo(utils::HalRevision halRev) const; 41 V1_1::ProgramInfo getProgramInfo(utils::HalRevision halRev) const;
42 42
43 friend bool operator<(const VirtualProgram& lhs, const VirtualProgram& rhs); 43 friend bool operator<(const VirtualProgram& lhs, const VirtualProgram& rhs);
44}; 44};
45 45
46std::vector<ProgramInfo> getProgramInfoVector(const std::vector<VirtualProgram>& vec, 46std::vector<V1_1::ProgramInfo> getProgramInfoVector(const std::vector<VirtualProgram>& vec,
47 utils::HalRevision halRev); 47 utils::HalRevision halRev);
48 48
49} // namespace implementation 49} // namespace implementation
50} // namespace V1_1 50} // namespace V1_2
51} // namespace broadcastradio 51} // namespace broadcastradio
52} // namespace hardware 52} // namespace hardware
53} // namespace android 53} // namespace android
54 54
55#endif // ANDROID_HARDWARE_BROADCASTRADIO_V1_1_VIRTUALPROGRAM_H 55#endif // ANDROID_HARDWARE_BROADCASTRADIO_V1_2_VIRTUALPROGRAM_H
diff --git a/broadcastradio/1.1/default/VirtualRadio.cpp b/broadcastradio/1.2/default/VirtualRadio.cpp
index 36d47a92..867726d2 100644
--- a/broadcastradio/1.1/default/VirtualRadio.cpp
+++ b/broadcastradio/1.2/default/VirtualRadio.cpp
@@ -24,11 +24,12 @@
24namespace android { 24namespace android {
25namespace hardware { 25namespace hardware {
26namespace broadcastradio { 26namespace broadcastradio {
27namespace V1_1 { 27namespace V1_2 {
28namespace implementation { 28namespace implementation {
29 29
30using V1_0::Band; 30using V1_0::Band;
31using V1_0::Class; 31using V1_0::Class;
32using V1_1::ProgramSelector;
32 33
33using std::lock_guard; 34using std::lock_guard;
34using std::move; 35using std::move;
@@ -99,7 +100,7 @@ VirtualRadio& getDigitalRadio() {
99} 100}
100 101
101} // namespace implementation 102} // namespace implementation
102} // namespace V1_1 103} // namespace V1_2
103} // namespace broadcastradio 104} // namespace broadcastradio
104} // namespace hardware 105} // namespace hardware
105} // namespace android 106} // namespace android
diff --git a/broadcastradio/1.1/default/VirtualRadio.h b/broadcastradio/1.2/default/VirtualRadio.h
index 3c7ae5c1..8cfaefeb 100644
--- a/broadcastradio/1.1/default/VirtualRadio.h
+++ b/broadcastradio/1.2/default/VirtualRadio.h
@@ -13,8 +13,8 @@
13 * See the License for the specific language governing permissions and 13 * See the License for the specific language governing permissions and
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16#ifndef ANDROID_HARDWARE_BROADCASTRADIO_V1_1_VIRTUALRADIO_H 16#ifndef ANDROID_HARDWARE_BROADCASTRADIO_V1_2_VIRTUALRADIO_H
17#define ANDROID_HARDWARE_BROADCASTRADIO_V1_1_VIRTUALRADIO_H 17#define ANDROID_HARDWARE_BROADCASTRADIO_V1_2_VIRTUALRADIO_H
18 18
19#include "VirtualProgram.h" 19#include "VirtualProgram.h"
20 20
@@ -24,7 +24,7 @@
24namespace android { 24namespace android {
25namespace hardware { 25namespace hardware {
26namespace broadcastradio { 26namespace broadcastradio {
27namespace V1_1 { 27namespace V1_2 {
28namespace implementation { 28namespace implementation {
29 29
30/** 30/**
@@ -40,7 +40,7 @@ class VirtualRadio {
40 VirtualRadio(const std::vector<VirtualProgram> initialList); 40 VirtualRadio(const std::vector<VirtualProgram> initialList);
41 41
42 std::vector<VirtualProgram> getProgramList(); 42 std::vector<VirtualProgram> getProgramList();
43 bool getProgram(const ProgramSelector& selector, VirtualProgram& program); 43 bool getProgram(const V1_1::ProgramSelector& selector, VirtualProgram& program);
44 44
45 private: 45 private:
46 std::mutex mMut; 46 std::mutex mMut;
@@ -72,9 +72,9 @@ VirtualRadio& getSatRadio();
72VirtualRadio& getDigitalRadio(); 72VirtualRadio& getDigitalRadio();
73 73
74} // namespace implementation 74} // namespace implementation
75} // namespace V1_1 75} // namespace V1_2
76} // namespace broadcastradio 76} // namespace broadcastradio
77} // namespace hardware 77} // namespace hardware
78} // namespace android 78} // namespace android
79 79
80#endif // ANDROID_HARDWARE_BROADCASTRADIO_V1_1_VIRTUALRADIO_H 80#endif // ANDROID_HARDWARE_BROADCASTRADIO_V1_2_VIRTUALRADIO_H
diff --git a/broadcastradio/1.1/default/android.hardware.broadcastradio@1.1-service.rc b/broadcastradio/1.2/default/android.hardware.broadcastradio@1.2-service.rc
index 7c57135f..3741f21a 100644
--- a/broadcastradio/1.1/default/android.hardware.broadcastradio@1.1-service.rc
+++ b/broadcastradio/1.2/default/android.hardware.broadcastradio@1.2-service.rc
@@ -1,4 +1,4 @@
1service broadcastradio-hal /vendor/bin/hw/android.hardware.broadcastradio@1.1-service 1service broadcastradio-hal /vendor/bin/hw/android.hardware.broadcastradio@1.2-service
2 class hal 2 class hal
3 user audioserver 3 user audioserver
4 group audio 4 group audio
diff --git a/broadcastradio/1.1/default/resources.h b/broadcastradio/1.2/default/resources.h
index b7e709f9..b383c278 100644
--- a/broadcastradio/1.1/default/resources.h
+++ b/broadcastradio/1.2/default/resources.h
@@ -13,13 +13,13 @@
13 * See the License for the specific language governing permissions and 13 * See the License for the specific language governing permissions and
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16#ifndef ANDROID_HARDWARE_BROADCASTRADIO_V1_1_RESOURCES_H 16#ifndef ANDROID_HARDWARE_BROADCASTRADIO_V1_2_RESOURCES_H
17#define ANDROID_HARDWARE_BROADCASTRADIO_V1_1_RESOURCES_H 17#define ANDROID_HARDWARE_BROADCASTRADIO_V1_2_RESOURCES_H
18 18
19namespace android { 19namespace android {
20namespace hardware { 20namespace hardware {
21namespace broadcastradio { 21namespace broadcastradio {
22namespace V1_1 { 22namespace V1_2 {
23namespace implementation { 23namespace implementation {
24namespace resources { 24namespace resources {
25 25
@@ -38,9 +38,9 @@ constexpr uint8_t demoPng[] = {
38 38
39} // namespace resources 39} // namespace resources
40} // namespace implementation 40} // namespace implementation
41} // namespace V1_1 41} // namespace V1_2
42} // namespace broadcastradio 42} // namespace broadcastradio
43} // namespace hardware 43} // namespace hardware
44} // namespace android 44} // namespace android
45 45
46#endif // ANDROID_HARDWARE_BROADCASTRADIO_V1_1_RESOURCES_H 46#endif // ANDROID_HARDWARE_BROADCASTRADIO_V1_2_RESOURCES_H
diff --git a/broadcastradio/1.1/default/service.cpp b/broadcastradio/1.2/default/service.cpp
index f8af0b78..ea86fbaf 100644
--- a/broadcastradio/1.1/default/service.cpp
+++ b/broadcastradio/1.2/default/service.cpp
@@ -22,7 +22,7 @@
22 22
23using android::hardware::configureRpcThreadpool; 23using android::hardware::configureRpcThreadpool;
24using android::hardware::joinRpcThreadpool; 24using android::hardware::joinRpcThreadpool;
25using android::hardware::broadcastradio::V1_1::implementation::BroadcastRadioFactory; 25using android::hardware::broadcastradio::V1_2::implementation::BroadcastRadioFactory;
26 26
27int main(int /* argc */, char** /* argv */) { 27int main(int /* argc */, char** /* argv */) {
28 configureRpcThreadpool(4, true); 28 configureRpcThreadpool(4, true);
diff --git a/broadcastradio/1.2/types.hal b/broadcastradio/1.2/types.hal
new file mode 100644
index 00000000..5edb097a
--- /dev/null
+++ b/broadcastradio/1.2/types.hal
@@ -0,0 +1,23 @@
1/**
2 * Copyright 2017 The Android Open Source Project
3 *
4 * Licensed under the Apache License, Version 2.0 (the "License");
5 * you may not use this file except in compliance with the License.
6 * You may obtain a copy of the License at
7 *
8 * http://www.apache.org/licenses/LICENSE-2.0
9 *
10 * Unless required by applicable law or agreed to in writing, software
11 * distributed under the License is distributed on an "AS IS" BASIS,
12 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 * See the License for the specific language governing permissions and
14 * limitations under the License.
15 */
16
17package android.hardware.broadcastradio@1.2;
18
19import @1.1::Result;
20import @1.1::VendorKeyValue;
21
22typedef @1.1::Result Result;
23typedef @1.1::VendorKeyValue VendorKeyValue;
diff --git a/broadcastradio/1.1/tests/OWNERS b/broadcastradio/1.2/vts/OWNERS
index aa5ce82e..21e1cd66 100644
--- a/broadcastradio/1.1/tests/OWNERS
+++ b/broadcastradio/1.2/vts/OWNERS
@@ -1,6 +1,5 @@
1# Automotive team 1# Automotive team
2egranata@google.com 2egranata@google.com
3keunyoung@google.com
4twasilczyk@google.com 3twasilczyk@google.com
5 4
6# VTS team 5# VTS team
diff --git a/broadcastradio/1.2/vts/functional/Android.bp b/broadcastradio/1.2/vts/functional/Android.bp
new file mode 100644
index 00000000..12da14e4
--- /dev/null
+++ b/broadcastradio/1.2/vts/functional/Android.bp
@@ -0,0 +1,29 @@
1//
2// Copyright (C) 2017 The Android Open Source Project
3//
4// Licensed under the Apache License, Version 2.0 (the "License");
5// you may not use this file except in compliance with the License.
6// You may obtain a copy of the License at
7//
8// http://www.apache.org/licenses/LICENSE-2.0
9//
10// Unless required by applicable law or agreed to in writing, software
11// distributed under the License is distributed on an "AS IS" BASIS,
12// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13// See the License for the specific language governing permissions and
14// limitations under the License.
15//
16
17cc_test {
18 name: "VtsHalBroadcastradioV1_2TargetTest",
19 defaults: ["VtsHalTargetTestDefaults"],
20 srcs: ["VtsHalBroadcastradioV1_2TargetTest.cpp"],
21 static_libs: [
22 "android.hardware.broadcastradio@1.0",
23 "android.hardware.broadcastradio@1.1",
24 "android.hardware.broadcastradio@1.2",
25 "android.hardware.broadcastradio@common-utils-lib",
26 "android.hardware.broadcastradio@vts-utils-lib",
27 "libgmock",
28 ],
29}
diff --git a/broadcastradio/1.2/vts/functional/VtsHalBroadcastradioV1_2TargetTest.cpp b/broadcastradio/1.2/vts/functional/VtsHalBroadcastradioV1_2TargetTest.cpp
new file mode 100644
index 00000000..f0759459
--- /dev/null
+++ b/broadcastradio/1.2/vts/functional/VtsHalBroadcastradioV1_2TargetTest.cpp
@@ -0,0 +1,312 @@
1/*
2 * Copyright (C) 2017 The Android Open Source Project
3 *
4 * Licensed under the Apache License, Version 2.0 (the "License");
5 * you may not use this file except in compliance with the License.
6 * You may obtain a copy of the License at
7 *
8 * http://www.apache.org/licenses/LICENSE-2.0
9 *
10 * Unless required by applicable law or agreed to in writing, software
11 * distributed under the License is distributed on an "AS IS" BASIS,
12 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 * See the License for the specific language governing permissions and
14 * limitations under the License.
15 */
16
17#define LOG_TAG "broadcastradio.vts"
18
19#include <VtsHalHidlTargetTestBase.h>
20#include <android/hardware/broadcastradio/1.1/IBroadcastRadio.h>
21#include <android/hardware/broadcastradio/1.2/IBroadcastRadioFactory.h>
22#include <android/hardware/broadcastradio/1.2/ITuner.h>
23#include <android/hardware/broadcastradio/1.2/ITunerCallback.h>
24#include <android/hardware/broadcastradio/1.2/types.h>
25#include <android-base/logging.h>
26#include <broadcastradio-utils/Utils.h>
27#include <broadcastradio-vts-utils/call-barrier.h>
28#include <broadcastradio-vts-utils/mock-timeout.h>
29#include <cutils/native_handle.h>
30#include <cutils/properties.h>
31#include <gmock/gmock.h>
32#include <hidl/HidlTransportSupport.h>
33#include <utils/threads.h>
34
35#include <chrono>
36
37namespace android {
38namespace hardware {
39namespace broadcastradio {
40namespace V1_2 {
41namespace vts {
42
43using namespace std::chrono_literals;
44
45using testing::_;
46using testing::AnyNumber;
47using testing::ByMove;
48using testing::DoAll;
49using testing::Invoke;
50using testing::SaveArg;
51
52using broadcastradio::vts::CallBarrier;
53using V1_0::BandConfig;
54using V1_0::Class;
55using V1_0::MetaData;
56using V1_0::MetadataKey;
57using V1_0::MetadataType;
58using V1_1::IBroadcastRadio;
59using V1_1::ProgramInfo;
60using V1_1::ProgramListResult;
61using V1_1::ProgramSelector;
62using V1_1::Properties;
63
64using std::chrono::steady_clock;
65using std::this_thread::sleep_for;
66
67static constexpr auto kConfigTimeout = 10s;
68static constexpr auto kConnectModuleTimeout = 1s;
69
70static void printSkipped(std::string msg) {
71 std::cout << "[ SKIPPED ] " << msg << std::endl;
72}
73
74struct TunerCallbackMock : public ITunerCallback {
75 TunerCallbackMock() { EXPECT_CALL(*this, hardwareFailure()).Times(0); }
76
77 MOCK_METHOD0(hardwareFailure, Return<void>());
78 MOCK_TIMEOUT_METHOD2(configChange, Return<void>(Result, const BandConfig&));
79 MOCK_METHOD2(tuneComplete, Return<void>(Result, const V1_0::ProgramInfo&));
80 MOCK_TIMEOUT_METHOD2(tuneComplete_1_1, Return<void>(Result, const ProgramSelector&));
81 MOCK_METHOD1(afSwitch, Return<void>(const V1_0::ProgramInfo&));
82 MOCK_METHOD1(antennaStateChange, Return<void>(bool connected));
83 MOCK_METHOD1(trafficAnnouncement, Return<void>(bool active));
84 MOCK_METHOD1(emergencyAnnouncement, Return<void>(bool active));
85 MOCK_METHOD3(newMetadata, Return<void>(uint32_t ch, uint32_t subCh, const hidl_vec<MetaData>&));
86 MOCK_METHOD1(backgroundScanAvailable, Return<void>(bool));
87 MOCK_TIMEOUT_METHOD1(backgroundScanComplete, Return<void>(ProgramListResult));
88 MOCK_METHOD0(programListChanged, Return<void>());
89 MOCK_TIMEOUT_METHOD1(currentProgramInfoChanged, Return<void>(const ProgramInfo&));
90 MOCK_METHOD1(parametersUpdated, Return<void>(const hidl_vec<VendorKeyValue>& parameters));
91};
92
93class BroadcastRadioHalTest : public ::testing::VtsHalHidlTargetTestBase,
94 public ::testing::WithParamInterface<Class> {
95 protected:
96 virtual void SetUp() override;
97 virtual void TearDown() override;
98
99 bool openTuner();
100
101 Class radioClass;
102 bool skipped = false;
103
104 sp<IBroadcastRadio> mRadioModule;
105 sp<ITuner> mTuner;
106 sp<TunerCallbackMock> mCallback = new TunerCallbackMock();
107
108 private:
109 const BandConfig& getBand(unsigned idx);
110
111 hidl_vec<BandConfig> mBands;
112};
113
114/**
115 * Clears strong pointer and waits until the object gets destroyed.
116 *
117 * @param ptr The pointer to get cleared.
118 * @param timeout Time to wait for other references.
119 */
120template <typename T>
121static void clearAndWait(sp<T>& ptr, std::chrono::milliseconds timeout) {
122 wp<T> wptr = ptr;
123 ptr.clear();
124 auto limit = steady_clock::now() + timeout;
125 while (wptr.promote() != nullptr) {
126 constexpr auto step = 10ms;
127 if (steady_clock::now() + step > limit) {
128 FAIL() << "Pointer was not released within timeout";
129 break;
130 }
131 sleep_for(step);
132 }
133}
134
135void BroadcastRadioHalTest::SetUp() {
136 radioClass = GetParam();
137
138 // lookup HIDL service
139 auto factory = getService<IBroadcastRadioFactory>();
140 ASSERT_NE(nullptr, factory.get());
141
142 // connect radio module
143 Result connectResult;
144 CallBarrier onConnect;
145 factory->connectModule(radioClass, [&](Result ret, const sp<V1_0::IBroadcastRadio>& radio) {
146 connectResult = ret;
147 if (ret == Result::OK) mRadioModule = IBroadcastRadio::castFrom(radio);
148 onConnect.call();
149 });
150 ASSERT_TRUE(onConnect.waitForCall(kConnectModuleTimeout));
151
152 if (connectResult == Result::INVALID_ARGUMENTS) {
153 printSkipped("This device class is not supported.");
154 skipped = true;
155 return;
156 }
157 ASSERT_EQ(connectResult, Result::OK);
158 ASSERT_NE(nullptr, mRadioModule.get());
159
160 // get module properties
161 Properties prop11;
162 auto& prop10 = prop11.base;
163 auto propResult =
164 mRadioModule->getProperties_1_1([&](const Properties& properties) { prop11 = properties; });
165
166 ASSERT_TRUE(propResult.isOk());
167 EXPECT_EQ(radioClass, prop10.classId);
168 EXPECT_GT(prop10.numTuners, 0u);
169 EXPECT_GT(prop11.supportedProgramTypes.size(), 0u);
170 EXPECT_GT(prop11.supportedIdentifierTypes.size(), 0u);
171 if (radioClass == Class::AM_FM) {
172 EXPECT_GT(prop10.bands.size(), 0u);
173 }
174 mBands = prop10.bands;
175}
176
177void BroadcastRadioHalTest::TearDown() {
178 mTuner.clear();
179 mRadioModule.clear();
180 clearAndWait(mCallback, 1s);
181}
182
183bool BroadcastRadioHalTest::openTuner() {
184 EXPECT_EQ(nullptr, mTuner.get());
185
186 if (radioClass == Class::AM_FM) {
187 EXPECT_TIMEOUT_CALL(*mCallback, configChange, Result::OK, _);
188 }
189
190 Result halResult = Result::NOT_INITIALIZED;
191 auto openCb = [&](Result result, const sp<V1_0::ITuner>& tuner) {
192 halResult = result;
193 if (result != Result::OK) return;
194 mTuner = ITuner::castFrom(tuner);
195 };
196 auto hidlResult = mRadioModule->openTuner(getBand(0), true, mCallback, openCb);
197
198 EXPECT_TRUE(hidlResult.isOk());
199 EXPECT_EQ(Result::OK, halResult);
200 EXPECT_NE(nullptr, mTuner.get());
201 if (radioClass == Class::AM_FM && mTuner != nullptr) {
202 EXPECT_TIMEOUT_CALL_WAIT(*mCallback, configChange, kConfigTimeout);
203
204 BandConfig halConfig;
205 Result halResult = Result::NOT_INITIALIZED;
206 mTuner->getConfiguration([&](Result result, const BandConfig& config) {
207 halResult = result;
208 halConfig = config;
209 });
210 EXPECT_EQ(Result::OK, halResult);
211 EXPECT_TRUE(halConfig.antennaConnected);
212 }
213
214 EXPECT_NE(nullptr, mTuner.get());
215 return nullptr != mTuner.get();
216}
217
218const BandConfig& BroadcastRadioHalTest::getBand(unsigned idx) {
219 static const BandConfig dummyBandConfig = {};
220
221 if (radioClass != Class::AM_FM) {
222 ALOGD("Not AM/FM radio, returning dummy band config");
223 return dummyBandConfig;
224 }
225
226 EXPECT_GT(mBands.size(), idx);
227 if (mBands.size() <= idx) {
228 ALOGD("Band index out of bound, returning dummy band config");
229 return dummyBandConfig;
230 }
231
232 auto& band = mBands[idx];
233 ALOGD("Returning %s band", toString(band.type).c_str());
234 return band;
235}
236
237/**
238 * Test IBroadcastRadio::get|setParameters() methods called with no parameters.
239 *
240 * Verifies that:
241 * - callback is called for empty parameters set.
242 */
243TEST_P(BroadcastRadioHalTest, NoParameters) {
244 if (skipped) return;
245
246 ASSERT_TRUE(openTuner());
247
248 hidl_vec<VendorKeyValue> halResults = {};
249 bool wasCalled = false;
250 auto cb = [&](hidl_vec<VendorKeyValue> results) {
251 wasCalled = true;
252 halResults = results;
253 };
254
255 auto hidlResult = mTuner->setParameters({}, cb);
256 ASSERT_TRUE(hidlResult.isOk());
257 ASSERT_TRUE(wasCalled);
258 ASSERT_EQ(0u, halResults.size());
259
260 wasCalled = false;
261 hidlResult = mTuner->getParameters({}, cb);
262 ASSERT_TRUE(hidlResult.isOk());
263 ASSERT_TRUE(wasCalled);
264 ASSERT_EQ(0u, halResults.size());
265}
266
267/**
268 * Test IBroadcastRadio::get|setParameters() methods called with unknown parameters.
269 *
270 * Verifies that:
271 * - unknown parameters are ignored;
272 * - callback is called also for empty results set.
273 */
274TEST_P(BroadcastRadioHalTest, UnknownParameters) {
275 if (skipped) return;
276
277 ASSERT_TRUE(openTuner());
278
279 hidl_vec<VendorKeyValue> halResults = {};
280 bool wasCalled = false;
281 auto cb = [&](hidl_vec<VendorKeyValue> results) {
282 wasCalled = true;
283 halResults = results;
284 };
285
286 auto hidlResult = mTuner->setParameters({{"com.google.unknown", "dummy"}}, cb);
287 ASSERT_TRUE(hidlResult.isOk());
288 ASSERT_TRUE(wasCalled);
289 ASSERT_EQ(0u, halResults.size());
290
291 wasCalled = false;
292 hidlResult = mTuner->getParameters({{"com.google.unknown*", "dummy"}}, cb);
293 ASSERT_TRUE(hidlResult.isOk());
294 ASSERT_TRUE(wasCalled);
295 ASSERT_EQ(0u, halResults.size());
296}
297
298INSTANTIATE_TEST_CASE_P(BroadcastRadioHalTestCases, BroadcastRadioHalTest,
299 ::testing::Values(Class::AM_FM, Class::SAT, Class::DT));
300
301} // namespace vts
302} // namespace V1_2
303} // namespace broadcastradio
304} // namespace hardware
305} // namespace android
306
307int main(int argc, char** argv) {
308 ::testing::InitGoogleTest(&argc, argv);
309 int status = RUN_ALL_TESTS();
310 ALOGI("Test result = %d", status);
311 return status;
312}
diff --git a/broadcastradio/Android.bp b/broadcastradio/Android.bp
index 8c65bf60..68cc99fc 100644
--- a/broadcastradio/Android.bp
+++ b/broadcastradio/Android.bp
@@ -4,9 +4,11 @@ subdirs = [
4 "1.0/default", 4 "1.0/default",
5 "1.0/vts/functional", 5 "1.0/vts/functional",
6 "1.1", 6 "1.1",
7 "1.1/default",
8 "1.1/tests",
9 "1.1/utils",
10 "1.1/vts/functional", 7 "1.1/vts/functional",
11 "1.1/vts/utils", 8 "1.2",
9 "1.2/default",
10 "1.2/vts/functional",
11 "common/tests",
12 "common/utils",
13 "common/vts/utils",
12] 14]
diff --git a/broadcastradio/1.1/tests/Android.bp b/broadcastradio/common/tests/Android.bp
index fa1fd944..44566028 100644
--- a/broadcastradio/1.1/tests/Android.bp
+++ b/broadcastradio/common/tests/Android.bp
@@ -15,7 +15,7 @@
15// 15//
16 16
17cc_test { 17cc_test {
18 name: "android.hardware.broadcastradio@1.1-utils-tests", 18 name: "android.hardware.broadcastradio@common-utils-tests",
19 vendor: true, 19 vendor: true,
20 cflags: [ 20 cflags: [
21 "-Wall", 21 "-Wall",
@@ -25,5 +25,5 @@ cc_test {
25 srcs: [ 25 srcs: [
26 "WorkerThread_test.cpp", 26 "WorkerThread_test.cpp",
27 ], 27 ],
28 static_libs: ["android.hardware.broadcastradio@1.1-utils-lib"], 28 static_libs: ["android.hardware.broadcastradio@common-utils-lib"],
29} 29} \ No newline at end of file
diff --git a/broadcastradio/common/tests/OWNERS b/broadcastradio/common/tests/OWNERS
new file mode 100644
index 00000000..21e1cd66
--- /dev/null
+++ b/broadcastradio/common/tests/OWNERS
@@ -0,0 +1,7 @@
1# Automotive team
2egranata@google.com
3twasilczyk@google.com
4
5# VTS team
6ryanjcampbell@google.com
7yim@google.com
diff --git a/broadcastradio/1.1/tests/WorkerThread_test.cpp b/broadcastradio/common/tests/WorkerThread_test.cpp
index ed36de3e..ed36de3e 100644
--- a/broadcastradio/1.1/tests/WorkerThread_test.cpp
+++ b/broadcastradio/common/tests/WorkerThread_test.cpp
diff --git a/broadcastradio/1.1/utils/Android.bp b/broadcastradio/common/utils/Android.bp
index e80d133d..d8bd1255 100644
--- a/broadcastradio/1.1/utils/Android.bp
+++ b/broadcastradio/common/utils/Android.bp
@@ -15,7 +15,7 @@
15// 15//
16 16
17cc_library_static { 17cc_library_static {
18 name: "android.hardware.broadcastradio@1.1-utils-lib", 18 name: "android.hardware.broadcastradio@common-utils-lib",
19 vendor_available: true, 19 vendor_available: true,
20 relative_install_path: "hw", 20 relative_install_path: "hw",
21 cflags: [ 21 cflags: [
diff --git a/broadcastradio/1.1/utils/OWNERS b/broadcastradio/common/utils/OWNERS
index 0c27b718..136b607b 100644
--- a/broadcastradio/1.1/utils/OWNERS
+++ b/broadcastradio/common/utils/OWNERS
@@ -1,4 +1,3 @@
1# Automotive team 1# Automotive team
2egranata@google.com 2egranata@google.com
3keunyoung@google.com
4twasilczyk@google.com 3twasilczyk@google.com
diff --git a/broadcastradio/1.1/utils/Utils.cpp b/broadcastradio/common/utils/Utils.cpp
index 4dd6b139..bdaf8e8c 100644
--- a/broadcastradio/1.1/utils/Utils.cpp
+++ b/broadcastradio/common/utils/Utils.cpp
@@ -23,10 +23,13 @@
23namespace android { 23namespace android {
24namespace hardware { 24namespace hardware {
25namespace broadcastradio { 25namespace broadcastradio {
26namespace V1_1 {
27namespace utils { 26namespace utils {
28 27
29using V1_0::Band; 28using V1_0::Band;
29using V1_1::IdentifierType;
30using V1_1::ProgramIdentifier;
31using V1_1::ProgramSelector;
32using V1_1::ProgramType;
30 33
31static bool isCompatibleProgramType(const uint32_t ia, const uint32_t ib) { 34static bool isCompatibleProgramType(const uint32_t ia, const uint32_t ib) {
32 auto a = static_cast<ProgramType>(ia); 35 auto a = static_cast<ProgramType>(ia);
@@ -208,7 +211,6 @@ bool isDigital(const ProgramSelector& sel) {
208} 211}
209 212
210} // namespace utils 213} // namespace utils
211} // namespace V1_1
212 214
213namespace V1_0 { 215namespace V1_0 {
214 216
@@ -218,9 +220,9 @@ bool operator==(const BandConfig& l, const BandConfig& r) {
218 if (l.lowerLimit != r.lowerLimit) return false; 220 if (l.lowerLimit != r.lowerLimit) return false;
219 if (l.upperLimit != r.upperLimit) return false; 221 if (l.upperLimit != r.upperLimit) return false;
220 if (l.spacings != r.spacings) return false; 222 if (l.spacings != r.spacings) return false;
221 if (V1_1::utils::isAm(l.type)) { 223 if (utils::isAm(l.type)) {
222 return l.ext.am == r.ext.am; 224 return l.ext.am == r.ext.am;
223 } else if (V1_1::utils::isFm(l.type)) { 225 } else if (utils::isFm(l.type)) {
224 return l.ext.fm == r.ext.fm; 226 return l.ext.fm == r.ext.fm;
225 } else { 227 } else {
226 ALOGW("Unsupported band config type: %s", toString(l.type).c_str()); 228 ALOGW("Unsupported band config type: %s", toString(l.type).c_str());
diff --git a/broadcastradio/1.1/utils/WorkerThread.cpp b/broadcastradio/common/utils/WorkerThread.cpp
index bfcbb390..bfcbb390 100644
--- a/broadcastradio/1.1/utils/WorkerThread.cpp
+++ b/broadcastradio/common/utils/WorkerThread.cpp
diff --git a/broadcastradio/1.1/utils/include/broadcastradio-utils/Utils.h b/broadcastradio/common/utils/include/broadcastradio-utils/Utils.h
index 24c60ee4..b07ce79b 100644
--- a/broadcastradio/1.1/utils/include/broadcastradio-utils/Utils.h
+++ b/broadcastradio/common/utils/include/broadcastradio-utils/Utils.h
@@ -13,8 +13,8 @@
13 * See the License for the specific language governing permissions and 13 * See the License for the specific language governing permissions and
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16#ifndef ANDROID_HARDWARE_BROADCASTRADIO_V1_1_UTILS_H 16#ifndef ANDROID_HARDWARE_BROADCASTRADIO_COMMON_UTILS_H
17#define ANDROID_HARDWARE_BROADCASTRADIO_V1_1_UTILS_H 17#define ANDROID_HARDWARE_BROADCASTRADIO_COMMON_UTILS_H
18 18
19#include <android/hardware/broadcastradio/1.1/types.h> 19#include <android/hardware/broadcastradio/1.1/types.h>
20#include <chrono> 20#include <chrono>
@@ -24,13 +24,12 @@
24namespace android { 24namespace android {
25namespace hardware { 25namespace hardware {
26namespace broadcastradio { 26namespace broadcastradio {
27namespace V1_1 {
28namespace utils { 27namespace utils {
29 28
30// TODO(b/64115813): move it out from frameworks/base/services/core/jni/BroadcastRadio/types.h
31enum class HalRevision : uint32_t { 29enum class HalRevision : uint32_t {
32 V1_0 = 1, 30 V1_0 = 1,
33 V1_1, 31 V1_1,
32 V1_2,
34}; 33};
35 34
36/** 35/**
@@ -43,38 +42,38 @@ enum class HalRevision : uint32_t {
43 * @param pointer selector we're trying to match against channel. 42 * @param pointer selector we're trying to match against channel.
44 * @param channel existing channel. 43 * @param channel existing channel.
45 */ 44 */
46bool tunesTo(const ProgramSelector& pointer, const ProgramSelector& channel); 45bool tunesTo(const V1_1::ProgramSelector& pointer, const V1_1::ProgramSelector& channel);
47 46
48ProgramType getType(const ProgramSelector& sel); 47V1_1::ProgramType getType(const V1_1::ProgramSelector& sel);
49bool isAmFm(const ProgramType type); 48bool isAmFm(const V1_1::ProgramType type);
50 49
51bool isAm(const V1_0::Band band); 50bool isAm(const V1_0::Band band);
52bool isFm(const V1_0::Band band); 51bool isFm(const V1_0::Band band);
53 52
54bool hasId(const ProgramSelector& sel, const IdentifierType type); 53bool hasId(const V1_1::ProgramSelector& sel, const V1_1::IdentifierType type);
55 54
56/** 55/**
57 * Returns ID (either primary or secondary) for a given program selector. 56 * Returns ID (either primary or secondary) for a given program selector.
58 * 57 *
59 * If the selector does not contain given type, returns 0 and emits a warning. 58 * If the selector does not contain given type, returns 0 and emits a warning.
60 */ 59 */
61uint64_t getId(const ProgramSelector& sel, const IdentifierType type); 60uint64_t getId(const V1_1::ProgramSelector& sel, const V1_1::IdentifierType type);
62 61
63/** 62/**
64 * Returns ID (either primary or secondary) for a given program selector. 63 * Returns ID (either primary or secondary) for a given program selector.
65 * 64 *
66 * If the selector does not contain given type, returns default value. 65 * If the selector does not contain given type, returns default value.
67 */ 66 */
68uint64_t getId(const ProgramSelector& sel, const IdentifierType type, uint64_t defval); 67uint64_t getId(const V1_1::ProgramSelector& sel, const V1_1::IdentifierType type, uint64_t defval);
69 68
70ProgramSelector make_selector(V1_0::Band band, uint32_t channel, uint32_t subChannel = 0); 69V1_1::ProgramSelector make_selector(V1_0::Band band, uint32_t channel, uint32_t subChannel = 0);
71 70
72bool getLegacyChannel(const ProgramSelector& sel, uint32_t* channelOut, uint32_t* subChannelOut); 71bool getLegacyChannel(const V1_1::ProgramSelector& sel,
72 uint32_t* channelOut, uint32_t* subChannelOut);
73 73
74bool isDigital(const ProgramSelector& sel); 74bool isDigital(const V1_1::ProgramSelector& sel);
75 75
76} // namespace utils 76} // namespace utils
77} // namespace V1_1
78 77
79namespace V1_0 { 78namespace V1_0 {
80 79
@@ -86,4 +85,4 @@ bool operator==(const BandConfig& l, const BandConfig& r);
86} // namespace hardware 85} // namespace hardware
87} // namespace android 86} // namespace android
88 87
89#endif // ANDROID_HARDWARE_BROADCASTRADIO_V1_1_UTILS_H 88#endif // ANDROID_HARDWARE_BROADCASTRADIO_COMMON_UTILS_H
diff --git a/broadcastradio/1.1/utils/include/broadcastradio-utils/WorkerThread.h b/broadcastradio/common/utils/include/broadcastradio-utils/WorkerThread.h
index 635876fb..62bede6c 100644
--- a/broadcastradio/1.1/utils/include/broadcastradio-utils/WorkerThread.h
+++ b/broadcastradio/common/utils/include/broadcastradio-utils/WorkerThread.h
@@ -13,8 +13,8 @@
13 * See the License for the specific language governing permissions and 13 * See the License for the specific language governing permissions and
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16#ifndef ANDROID_HARDWARE_BROADCASTRADIO_V1_1_WORKERTHREAD_H 16#ifndef ANDROID_HARDWARE_BROADCASTRADIO_COMMON_WORKERTHREAD_H
17#define ANDROID_HARDWARE_BROADCASTRADIO_V1_1_WORKERTHREAD_H 17#define ANDROID_HARDWARE_BROADCASTRADIO_COMMON_WORKERTHREAD_H
18 18
19#include <chrono> 19#include <chrono>
20#include <queue> 20#include <queue>
@@ -48,4 +48,4 @@ class WorkerThread {
48 48
49} // namespace android 49} // namespace android
50 50
51#endif // ANDROID_HARDWARE_BROADCASTRADIO_V1_1_WORKERTHREAD_H 51#endif // ANDROID_HARDWARE_BROADCASTRADIO_COMMON_WORKERTHREAD_H
diff --git a/broadcastradio/1.1/vts/utils/Android.bp b/broadcastradio/common/vts/utils/Android.bp
index 0c7e2a44..4ba8a170 100644
--- a/broadcastradio/1.1/vts/utils/Android.bp
+++ b/broadcastradio/common/vts/utils/Android.bp
@@ -15,7 +15,7 @@
15// 15//
16 16
17cc_library_static { 17cc_library_static {
18 name: "android.hardware.broadcastradio@1.1-vts-utils-lib", 18 name: "android.hardware.broadcastradio@vts-utils-lib",
19 srcs: [ 19 srcs: [
20 "call-barrier.cpp", 20 "call-barrier.cpp",
21 ], 21 ],
diff --git a/broadcastradio/common/vts/utils/OWNERS b/broadcastradio/common/vts/utils/OWNERS
new file mode 100644
index 00000000..21e1cd66
--- /dev/null
+++ b/broadcastradio/common/vts/utils/OWNERS
@@ -0,0 +1,7 @@
1# Automotive team
2egranata@google.com
3twasilczyk@google.com
4
5# VTS team
6ryanjcampbell@google.com
7yim@google.com
diff --git a/broadcastradio/1.1/vts/utils/call-barrier.cpp b/broadcastradio/common/vts/utils/call-barrier.cpp
index d8c47162..d8c47162 100644
--- a/broadcastradio/1.1/vts/utils/call-barrier.cpp
+++ b/broadcastradio/common/vts/utils/call-barrier.cpp
diff --git a/broadcastradio/1.1/vts/utils/include/broadcastradio-vts-utils/call-barrier.h b/broadcastradio/common/vts/utils/include/broadcastradio-vts-utils/call-barrier.h
index 462396a5..462396a5 100644
--- a/broadcastradio/1.1/vts/utils/include/broadcastradio-vts-utils/call-barrier.h
+++ b/broadcastradio/common/vts/utils/include/broadcastradio-vts-utils/call-barrier.h
diff --git a/broadcastradio/1.1/vts/utils/include/broadcastradio-vts-utils/mock-timeout.h b/broadcastradio/common/vts/utils/include/broadcastradio-vts-utils/mock-timeout.h
index b0ce0880..b0ce0880 100644
--- a/broadcastradio/1.1/vts/utils/include/broadcastradio-vts-utils/mock-timeout.h
+++ b/broadcastradio/common/vts/utils/include/broadcastradio-vts-utils/mock-timeout.h
diff --git a/camera/device/3.3/Android.bp b/camera/device/3.3/Android.bp
index 2a199916..29b63f83 100644
--- a/camera/device/3.3/Android.bp
+++ b/camera/device/3.3/Android.bp
@@ -70,3 +70,88 @@ cc_library {
70 "android.hardware.graphics.common@1.0", 70 "android.hardware.graphics.common@1.0",
71 ], 71 ],
72} 72}
73
74genrule {
75 name: "android.hardware.camera.device@3.3-adapter-helper_genc++",
76 tools: ["hidl-gen"],
77 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.device@3.3",
78 srcs: [
79 ":android.hardware.camera.device@3.3_hal",
80 ],
81 out: [
82 "android/hardware/camera/device/3.3/ACameraDeviceSession.cpp",
83 ],
84}
85
86genrule {
87 name: "android.hardware.camera.device@3.3-adapter-helper_genc++_headers",
88 tools: ["hidl-gen"],
89 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.device@3.3",
90 srcs: [
91 ":android.hardware.camera.device@3.3_hal",
92 ],
93 out: [
94 "android/hardware/camera/device/3.3/ACameraDeviceSession.h",
95 ],
96}
97
98
99cc_library {
100 name: "android.hardware.camera.device@3.3-adapter-helper",
101 defaults: ["hidl-module-defaults"],
102 generated_sources: ["android.hardware.camera.device@3.3-adapter-helper_genc++"],
103 generated_headers: ["android.hardware.camera.device@3.3-adapter-helper_genc++_headers"],
104 export_generated_headers: ["android.hardware.camera.device@3.3-adapter-helper_genc++_headers"],
105 vendor_available: true,
106 shared_libs: [
107 "libhidlbase",
108 "libhidltransport",
109 "libhwbinder",
110 "liblog",
111 "libutils",
112 "libcutils",
113 "libhidladapter",
114 "android.hardware.camera.common@1.0",
115 "android.hardware.camera.device@3.2",
116 "android.hardware.camera.device@3.3",
117 "android.hardware.graphics.common@1.0",
118 "android.hardware.camera.device@3.2-adapter-helper",
119 "android.hidl.base@1.0-adapter-helper",
120 ],
121 export_shared_lib_headers: [
122 "libhidlbase",
123 "libhidltransport",
124 "libhwbinder",
125 "libutils",
126 "libhidladapter",
127 "android.hardware.camera.common@1.0",
128 "android.hardware.camera.device@3.2",
129 "android.hardware.camera.device@3.3",
130 "android.hardware.graphics.common@1.0",
131 "android.hardware.camera.device@3.2-adapter-helper",
132 "android.hidl.base@1.0-adapter-helper",
133 ],
134}
135
136genrule {
137 name: "android.hardware.camera.device@3.3-adapter_genc++",
138 tools: ["hidl-gen"],
139 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.device@3.3",
140 out: ["main.cpp"]
141}
142
143cc_test {
144 name: "android.hardware.camera.device@3.3-adapter",
145 shared_libs: [
146 "libhidladapter",
147 "libhidlbase",
148 "libhidltransport",
149 "libutils",
150 "android.hardware.camera.common@1.0",
151 "android.hardware.camera.device@3.2",
152 "android.hardware.camera.device@3.3",
153 "android.hardware.graphics.common@1.0",
154 "android.hardware.camera.device@3.3-adapter-helper",
155 ],
156 generated_sources: ["android.hardware.camera.device@3.3-adapter_genc++"],
157}
diff --git a/camera/provider/2.4/default/android.hardware.camera.provider@2.4-service.rc b/camera/provider/2.4/default/android.hardware.camera.provider@2.4-service.rc
index 2bf309b4..c9196284 100644
--- a/camera/provider/2.4/default/android.hardware.camera.provider@2.4-service.rc
+++ b/camera/provider/2.4/default/android.hardware.camera.provider@2.4-service.rc
@@ -1,4 +1,4 @@
1service camera-provider-2-4 /vendor/bin/hw/android.hardware.camera.provider@2.4-service 1service vendor.camera-provider-2-4 /vendor/bin/hw/android.hardware.camera.provider@2.4-service
2 class hal 2 class hal
3 user cameraserver 3 user cameraserver
4 group audio camera input drmrpc 4 group audio camera input drmrpc
diff --git a/cas/1.0/Android.bp b/cas/1.0/Android.bp
index 6d94793b..ea8c10ee 100644
--- a/cas/1.0/Android.bp
+++ b/cas/1.0/Android.bp
@@ -85,3 +85,83 @@ cc_library {
85 "libutils", 85 "libutils",
86 ], 86 ],
87} 87}
88
89genrule {
90 name: "android.hardware.cas@1.0-adapter-helper_genc++",
91 tools: ["hidl-gen"],
92 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.cas@1.0",
93 srcs: [
94 ":android.hardware.cas@1.0_hal",
95 ],
96 out: [
97 "android/hardware/cas/1.0/ACas.cpp",
98 "android/hardware/cas/1.0/ACasListener.cpp",
99 "android/hardware/cas/1.0/ADescramblerBase.cpp",
100 "android/hardware/cas/1.0/AMediaCasService.cpp",
101 ],
102}
103
104genrule {
105 name: "android.hardware.cas@1.0-adapter-helper_genc++_headers",
106 tools: ["hidl-gen"],
107 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.cas@1.0",
108 srcs: [
109 ":android.hardware.cas@1.0_hal",
110 ],
111 out: [
112 "android/hardware/cas/1.0/ACas.h",
113 "android/hardware/cas/1.0/ACasListener.h",
114 "android/hardware/cas/1.0/ADescramblerBase.h",
115 "android/hardware/cas/1.0/AMediaCasService.h",
116 ],
117}
118
119
120cc_library {
121 name: "android.hardware.cas@1.0-adapter-helper",
122 defaults: ["hidl-module-defaults"],
123 generated_sources: ["android.hardware.cas@1.0-adapter-helper_genc++"],
124 generated_headers: ["android.hardware.cas@1.0-adapter-helper_genc++_headers"],
125 export_generated_headers: ["android.hardware.cas@1.0-adapter-helper_genc++_headers"],
126 vendor_available: true,
127 shared_libs: [
128 "libhidlbase",
129 "libhidltransport",
130 "libhwbinder",
131 "liblog",
132 "libutils",
133 "libcutils",
134 "libhidladapter",
135 "android.hardware.cas@1.0",
136 "android.hidl.base@1.0-adapter-helper",
137 ],
138 export_shared_lib_headers: [
139 "libhidlbase",
140 "libhidltransport",
141 "libhwbinder",
142 "libutils",
143 "libhidladapter",
144 "android.hardware.cas@1.0",
145 "android.hidl.base@1.0-adapter-helper",
146 ],
147}
148
149genrule {
150 name: "android.hardware.cas@1.0-adapter_genc++",
151 tools: ["hidl-gen"],
152 cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.cas@1.0",
153 out: ["main.cpp"]
154}
155
156cc_test {
157 name: "android.hardware.cas@1.0-adapter",
158 shared_libs: [
159 "libhidladapter",
160 "libhidlbase",
161 "libhidltransport",
162 "libutils",
163 "android.hardware.cas@1.0",
164 "android.hardware.cas@1.0-adapter-helper",
165 ],
166 generated_sources: ["android.hardware.cas@1.0-adapter_genc++"],
167}
diff --git a/cas/1.0/CasHal.mk b/cas/1.0/Android.mk
index 3cae6bf4..1ff2b04d 100644
--- a/cas/1.0/CasHal.mk
+++ b/cas/1.0/Android.mk
@@ -1,68 +1,22 @@
1# 1# This file is autogenerated by hidl-gen. Do not edit manually.
2# Copyright (C) 2017 The Android Open Source Project
3#
4# Licensed under the Apache License, Version 2.0 (the "License");
5# you may not use this file except in compliance with the License.
6# You may obtain a copy of the License at
7#
8# http://www.apache.org/licenses/LICENSE-2.0
9#