diff options
| author | Calvin Huang <calhuang@google.com> | 2019-09-04 11:58:38 -0700 |
|---|---|---|
| committer | Calvin Huang <calhuang@google.com> | 2019-12-19 08:51:34 -0800 |
| commit | 2728132106c68dc136c93b95295f0cb20665c50d (patch) | |
| tree | 988d8372d0425be84da4010916cde2c909487132 /common | |
| parent | 5ad34e27ef68a343c67254d6d6889e605d04e75e (diff) | |
| download | device_generic_car-2728132106c68dc136c93b95295f0cb20665c50d.tar.gz device_generic_car-2728132106c68dc136c93b95295f0cb20665c50d.tar.bz2 device_generic_car-2728132106c68dc136c93b95295f0cb20665c50d.zip | |
DO NOT MERGE: Remove feature Camera and Fingerprint
Add the dummy before include asop_x86 to block the camera and
fingerprint xml to remove feature camera and fingerprint from
sdk_gcar_x86, then pass the cts tests.
Fix: 146174076
Test: android.providerui.cts.MediaStoreUiTest#testImageCaptureWithInadequeteLocationPermissions[0]
Change-Id: Icb050dc0c84cb476f5c51cf3c4fff211be4d2e8d
Diffstat (limited to 'common')
| -rw-r--r-- | common/car.mk | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/common/car.mk b/common/car.mk index de0250a..8b65a31 100644 --- a/common/car.mk +++ b/common/car.mk @@ -32,9 +32,14 @@ PRODUCT_COPY_FILES += \ packages/services/Car/car_product/init/init.car.rc:root/init.car.rc # Copy car_core_hardware and overwrite handheld_core_hardware.xml with a dummy config. +# Overwrite goldfish related xml with a dummy config. PRODUCT_COPY_FILES += \ device/generic/car/common/android.hardware.dummy.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml \ - device/generic/car/common/car_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/car_core_hardware.xml + device/generic/car/common/car_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/car_core_hardware.xml \ + device/generic/car/common/android.hardware.dummy.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.ar.xml \ + device/generic/car/common/android.hardware.dummy.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.autofocus.xml \ + device/generic/car/common/android.hardware.dummy.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.full.xml \ + device/generic/car/common/android.hardware.dummy.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.fingerprint.xml \ # Enable landscape PRODUCT_COPY_FILES += \ |