summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-06-14 13:35:50 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-06-14 13:35:50 +0000
commit2395f0beb508bddc4a64c0fb424e9ca1dce45c01 (patch)
treeb78d79408b4038d62f90c21be9c396f9f95e77d5
parenta48a02a3e2c1740367118b46a60a5331018bc78d (diff)
parentc360838c414f7a198a1fa2750fc52f6bc92e2cf7 (diff)
downloadcar-2395f0beb508bddc4a64c0fb424e9ca1dce45c01.tar.gz
Snap for 8720775 from c360838c414f7a198a1fa2750fc52f6bc92e2cf7 to mainline-sdkext-releaseaml_sdk_331811100aml_sdk_331412000aml_sdk_331410000aml_sdk_331310010aml_sdk_331111000aml_sdk_330810050aml_sdk_330810010
Change-Id: I71364439ec58764a4ba33d674889ff411fc4b120
-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 \