diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-12-09 04:10:33 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-12-09 04:10:33 +0000 |
| commit | 8dad6bc9c331c3d1920694d5a1cf74e42eebdc83 (patch) | |
| tree | 3408893e0704b1fd6b441c30c057c218866d8963 | |
| parent | 92b80a925fec8939b789162b85579b0ac82aed9d (diff) | |
| parent | 5b8c0f7d6f3a7fd668c11bfc1f2a421536b73068 (diff) | |
| download | car-8dad6bc9c331c3d1920694d5a1cf74e42eebdc83.tar.gz | |
Snap for 5171533 from 5b8c0f7d6f3a7fd668c11bfc1f2a421536b73068 to qt-release
Change-Id: I986bcc71cdde76ef2587e7c35d8c247bcd6758ed
| -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" /> |