diff options
author | Calvin Huang <calhuang@google.com> | 2020-04-16 15:56:23 -0700 |
---|---|---|
committer | Calvin Huang <calhuang@google.com> | 2020-04-16 16:40:21 -0700 |
commit | 5233b2e7533f517cdfcdb68fdb20a4f1e2cfde2e (patch) | |
tree | d5a0a287fa7a6a5cb5612ced8e3724fcf933a0ae /common | |
parent | c11f4aaaf79a99d41cc14ec1c4f55d14d2c82102 (diff) | |
download | device_generic_car-5233b2e7533f517cdfcdb68fdb20a4f1e2cfde2e.tar.gz device_generic_car-5233b2e7533f517cdfcdb68fdb20a4f1e2cfde2e.tar.bz2 device_generic_car-5233b2e7533f517cdfcdb68fdb20a4f1e2cfde2e.zip |
Clean car device manifest
Reuse goldfish manifest rather than copy to avoid conflict
Remove selinx for bluetooth.sim
Fix: 153734354
Test: Manual
Change-Id: I07c40d6d90639c3f0fa48b503ef061950a5038d2
Diffstat (limited to 'common')
-rw-r--r-- | common/car.mk | 10 | ||||
-rw-r--r-- | common/manifest.xml | 161 | ||||
-rw-r--r-- | common/sepolicy/vendor/property_contexts | 2 | ||||
-rw-r--r-- | common/sepolicy/vendor/vendor_init.te | 8 |
4 files changed, 3 insertions, 178 deletions
diff --git a/common/car.mk b/common/car.mk index 495d03c..763727c 100644 --- a/common/car.mk +++ b/common/car.mk @@ -20,6 +20,9 @@ PRODUCT_PACKAGES += \ android.hardware.automotive.vehicle@2.0-service \ android.hardware.automotive.audiocontrol@2.0-service \ +# vehicle Interface Manifest +DEVICE_MANIFEST_FILE += hardware/interfaces/automotive/vehicle/2.0/manifest.vehicle.xml + # Emulator configuration PRODUCT_COPY_FILES += \ device/generic/car/common/config.ini:config.ini @@ -63,17 +66,10 @@ PRODUCT_COPY_FILES += \ 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 -# Vendor Interface Manifest -DEVICE_MANIFEST_FILE := device/generic/car/common/manifest.xml - # Whitelisted packages per user type PRODUCT_COPY_FILES += \ device/generic/car/common/preinstalled-packages-product-car-emulator.xml:product/etc/sysconfig/preinstalled-packages-product-car-emulator.xml -# Car emulator specific sepolicy -BOARD_SEPOLICY_DIRS += \ - device/generic/car/common/sepolicy - # Number of pre-created users PRODUCT_SYSTEM_DEFAULT_PROPERTIES := \ android.car.number_pre_created_users=1 \ diff --git a/common/manifest.xml b/common/manifest.xml deleted file mode 100644 index 1125773..0000000 --- a/common/manifest.xml +++ /dev/null @@ -1,161 +0,0 @@ -<!-- A copy of the goldfish manifest with the addition of vehicle hals. --> -<manifest version="1.0" type="device" target-level="3"> - <hal format="hidl"> - <name>android.hardware.bluetooth</name> - <transport>hwbinder</transport> - <version>1.1</version> - <interface> - <name>IBluetoothHci</name> - <instance>default</instance> - </interface> - </hal> - <hal format="hidl"> - <name>android.hardware.bluetooth.audio</name> - <transport>hwbinder</transport> - <version>2.0</version> - <interface> - <name>IBluetoothAudioProvidersFactory</name> - <instance>default</instance> - </interface> - </hal> - <hal format="hidl"> - <name>android.hardware.drm</name> - <transport>hwbinder</transport> - <version>1.0</version> - <interface> - <name>ICryptoFactory</name> - <instance>default</instance> - </interface> - <interface> - <name>IDrmFactory</name> - <instance>default</instance> - </interface> - <fqname>@1.2::ICryptoFactory/clearkey</fqname> - <fqname>@1.2::IDrmFactory/clearkey</fqname> - <fqname>@1.2::ICryptoFactory/widevine</fqname> - <fqname>@1.2::IDrmFactory/widevine</fqname> - </hal> - <hal format="hidl"> - <name>android.hardware.audio.effect</name> - <transport>hwbinder</transport> - <version>6.0</version> - <interface> - <name>IEffectsFactory</name> - <instance>default</instance> - </interface> - </hal> - <hal format="hidl"> - <name>android.hardware.configstore</name> - <transport>hwbinder</transport> - <version>1.1</version> - <interface> - <name>ISurfaceFlingerConfigs</name> - <instance>default</instance> - </interface> - </hal> - <hal format="hidl"> - <name>android.hardware.audio</name> - <transport>hwbinder</transport> - <version>6.0</version> - <interface> - <name>IDevicesFactory</name> - <instance>default</instance> - </interface> - </hal> - <hal format="hidl"> - <name>android.hardware.graphics.allocator</name> - <transport>hwbinder</transport> - <version>3.0</version> - <interface> - <name>IAllocator</name> - <instance>default</instance> - </interface> - </hal> - <hal format="hidl"> - <name>android.hardware.graphics.mapper</name> - <transport arch="32+64">passthrough</transport> - <version>3.0</version> - <interface> - <name>IMapper</name> - <instance>default</instance> - </interface> - </hal> - <hal format="hidl"> - <name>android.hardware.graphics.composer</name> - <transport>hwbinder</transport> - <version>2.3</version> - <interface> - <name>IComposer</name> - <instance>default</instance> - </interface> - </hal> - <hal format="hidl"> - <name>android.hardware.power</name> - <transport>hwbinder</transport> - <version>1.1</version> - <interface> - <name>IPower</name> - <instance>default</instance> - </interface> - </hal> - <hal format="hidl"> - <name>android.hardware.sensors</name> - <transport>hwbinder</transport> - <version>1.0</version> - <interface> - <name>ISensors</name> - <instance>default</instance> - </interface> - </hal> - <hal format="hidl"> - <name>android.hardware.media.omx</name> - <transport>hwbinder</transport> - <version>1.0</version> - <interface> - <name>IOmx</name> - <instance>default</instance> - </interface> - <interface> - <name>IOmxStore</name> - <instance>default</instance> - </interface> - </hal> - <hal format="hidl"> - <name>android.hardware.radio</name> - <transport>hwbinder</transport> - <version>1.0</version> - <interface> - <name>IRadio</name> - <instance>slot1</instance> - </interface> - </hal> - <hal format="hidl"> - <name>android.hardware.health</name> - <transport>hwbinder</transport> - <version>2.0</version> - <interface> - <name>IHealth</name> - <instance>default</instance> - </interface> - </hal> - <!-- Added for automotive --> - <hal format="hidl"> - <name>android.hardware.automotive.vehicle</name> - <transport>hwbinder</transport> - <version>2.0</version> - <interface> - <name>IVehicle</name> - <instance>default</instance> - </interface> - </hal> - <hal format="hidl"> - <name>android.hardware.authsecret</name> - <transport>hwbinder</transport> - <version>1.0</version> - <interface> - <name>IAuthSecret</name> - <instance>default</instance> - </interface> - </hal> - -</manifest> diff --git a/common/sepolicy/vendor/property_contexts b/common/sepolicy/vendor/property_contexts deleted file mode 100644 index 1925671..0000000 --- a/common/sepolicy/vendor/property_contexts +++ /dev/null @@ -1,2 +0,0 @@ -bt.rootcanal_mac_address u:object_r:hal_bluetooth_sim_prop:s0 -bt.rootcanal_test_console u:object_r:hal_bluetooth_sim_prop:s0
\ No newline at end of file diff --git a/common/sepolicy/vendor/vendor_init.te b/common/sepolicy/vendor/vendor_init.te deleted file mode 100644 index d3a115f..0000000 --- a/common/sepolicy/vendor/vendor_init.te +++ /dev/null @@ -1,8 +0,0 @@ -allow vendor_init { - audio_device - input_events_device - libcuttlefish_rild_device - region_screen_device -}:chr_file { getattr }; - -set_prop(vendor_init, hal_bluetooth_sim_prop) |