diff options
| author | Nicholas Sauer <nicksauer@google.com> | 2018-11-28 20:38:05 -0800 |
|---|---|---|
| committer | Nicholas Sauer <nicksauer@google.com> | 2018-11-30 04:55:15 +0000 |
| commit | 0b1d9fadd1bd325a76ad3dcc9e1e069f5fa7454d (patch) | |
| tree | 3408893e0704b1fd6b441c30c057c218866d8963 | |
| parent | dad2c72370b5f4e71ba379df0fc0c9ddb0645c03 (diff) | |
| download | device_generic_car-0b1d9fadd1bd325a76ad3dcc9e1e069f5fa7454d.tar.gz device_generic_car-0b1d9fadd1bd325a76ad3dcc9e1e069f5fa7454d.tar.bz2 device_generic_car-0b1d9fadd1bd325a76ad3dcc9e1e069f5fa7454d.zip | |
Remove android.software.app_widgets from car_core_hardware.xml
Also updated car.mk to copy xml's to the vendor directory to keep inline with generic. This also allows us to properly override handheld_core_hardware.xml.
bug: 115782669
bug: 120208671
Test: lunch gcar_emu-userdebug && m; emulator
Change-Id: Icbc738426e86dc571564e282570c5d7ac7478099
| -rw-r--r-- | common/car.mk | 12 | ||||
| -rw-r--r-- | common/car_core_hardware.xml | 1 |
2 files changed, 6 insertions, 7 deletions
diff --git a/common/car.mk b/common/car.mk index 07aa425..e0dc8e4 100644 --- a/common/car.mk +++ b/common/car.mk @@ -30,23 +30,23 @@ PRODUCT_COPY_FILES += \ # Enable landscape PRODUCT_COPY_FILES += \ - frameworks/native/data/etc/android.hardware.screen.landscape.xml:system/etc/permissions/android.hardware.screen.landscape.xml + frameworks/native/data/etc/android.hardware.screen.landscape.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.screen.landscape.xml # Used to embed a map in an activity view PRODUCT_COPY_FILES += \ - frameworks/native/data/etc/android.software.activities_on_secondary_displays.xml:system/etc/permissions/android.software.activities_on_secondary_displays.xml + frameworks/native/data/etc/android.software.activities_on_secondary_displays.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.activities_on_secondary_displays.xml # Overwrite handheld_core_hardware.xml with a dummy config. PRODUCT_COPY_FILES += \ - device/generic/car/common/android.hardware.dummy.xml:system/etc/permissions/handheld_core_hardware.xml \ + device/generic/car/common/android.hardware.dummy.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml \ device/generic/goldfish/data/etc/apns-conf.xml:system/etc/apns-conf.xml \ device/sample/etc/old-apns-conf.xml:system/etc/old-apns-conf.xml \ - device/generic/car/common/car_core_hardware.xml:system/etc/permissions/car_core_hardware.xml \ - frameworks/native/data/etc/android.hardware.type.automotive.xml:system/etc/permissions/android.hardware.type.automotive.xml + device/generic/car/common/car_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/car_core_hardware.xml \ + frameworks/native/data/etc/android.hardware.type.automotive.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.type.automotive.xml # Vendor Interface Manifest PRODUCT_COPY_FILES += \ - frameworks/native/data/etc/android.hardware.broadcastradio.xml:system/etc/permissions/android.hardware.broadcastradio.xml \ + frameworks/native/data/etc/android.hardware.broadcastradio.xml:$(TARGET_COPY_OUT_VENDOR)/system/etc/permissions/android.hardware.broadcastradio.xml \ device/generic/car/common/manifest.xml:$(TARGET_COPY_OUT_VENDOR)/manifest.xml TARGET_USES_CAR_FUTURE_FEATURES := true diff --git a/common/car_core_hardware.xml b/common/car_core_hardware.xml index 9c9f4c5..453baa5 100644 --- a/common/car_core_hardware.xml +++ b/common/car_core_hardware.xml @@ -39,7 +39,6 @@ <feature name="android.hardware.microphone" /> <!-- basic system services --> - <feature name="android.software.app_widgets" /> <feature name="android.software.connectionservice" /> <feature name="android.software.voice_recognizers" notLowRam="true" /> <feature name="android.software.backup" /> |