summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-06-13 22:45:20 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-06-13 22:45:20 +0000
commit73f0d3097bc42e67b9c39dacd19c6ae587b29e0a (patch)
treeb78d79408b4038d62f90c21be9c396f9f95e77d5
parent2e3a064c38ff117b4fe968194fa238aca685c015 (diff)
parentc360838c414f7a198a1fa2750fc52f6bc92e2cf7 (diff)
downloadcar-android13-mainline-adbd-release.tar.gz
Snap for 8717925 from c360838c414f7a198a1fa2750fc52f6bc92e2cf7 to mainline-adbd-releaseaml_adb_331610000aml_adb_331314020aml_adb_331113120aml_adb_331011050aml_adb_331011040android13-mainline-adbd-release
Change-Id: I0f0484b693a9a95bffae9138b7d061b094af6948
-rw-r--r--common/car_core_hardware.xml3
-rw-r--r--gsi_car_base.mk1
2 files changed, 4 insertions, 0 deletions
diff --git a/common/car_core_hardware.xml b/common/car_core_hardware.xml
index cdfb7f5..99ff362 100644
--- a/common/car_core_hardware.xml
+++ b/common/car_core_hardware.xml
@@ -40,6 +40,9 @@
<!-- Notably bluetooth is added to avoid crashing. It does not work in the emulator. -->
<feature name="android.hardware.bluetooth" />
+ <!-- Indicate support for the Android security model per the CDD. -->
+ <feature name="android.hardware.security.model.compatible" />
+
<!-- basic system services -->
<feature name="android.software.telecom" />
<feature name="android.software.voice_recognizers" notLowRam="true" />
diff --git a/gsi_car_base.mk b/gsi_car_base.mk
index 79f08f4..3fdfa77 100644
--- a/gsi_car_base.mk
+++ b/gsi_car_base.mk
@@ -147,6 +147,7 @@ PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST += \
system/priv-app/GarageModeTestApp/GarageModeTestApp.apk \
system/priv-app/LocalMediaPlayer/LocalMediaPlayer.apk \
system/priv-app/NetworkPreferenceApp/NetworkPreferenceApp.apk \
+ system/priv-app/RailwayReferenceApp/RailwayReferenceApp.apk \
system/lib64/libcarservicejni.so \
system/bin/android.automotive.telemetryd@1.0 \
system/etc/init/android.automotive.telemetryd@1.0.rc \