Clean car device manifest am: c51d697fa9
Change-Id: Ie0827e089b33fc47364a710832c0e1d2a54e8054
diff --git a/common/car.mk b/common/car.mk
index 9c1dffe..6d202c3 100644
--- a/common/car.mk
+++ b/common/car.mk
@@ -19,8 +19,9 @@
PRODUCT_PACKAGES += \
android.hardware.automotive.vehicle@2.0-service \
android.hardware.automotive.audiocontrol@1.0-service \
- android.hardware.bluetooth@1.1-service.sim \
- android.hardware.bluetooth.audio@2.0-impl \
+
+# vehicle Interface Manifest
+DEVICE_MANIFEST_FILE += hardware/interfaces/automotive/vehicle/2.0/manifest.vehicle.xml
# Emulator configuration
PRODUCT_COPY_FILES += \
@@ -65,10 +66,4 @@
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_MANIFEST_FILE := device/generic/car/common/manifest.xml
-
-# Car emulator specific sepolicy
-BOARD_SEPOLICY_DIRS += \
- device/generic/car/common/sepolicy
-
$(call inherit-product, packages/services/Car/car_product/build/car.mk)
diff --git a/common/manifest.xml b/common/manifest.xml
deleted file mode 100644
index f457a3a..0000000
--- a/common/manifest.xml
+++ /dev/null
@@ -1,227 +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.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>5.0</version>
- <interface>
- <name>IEffectsFactory</name>
- <instance>default</instance>
- </interface>
- </hal>
- <hal format="hidl">
- <name>android.hardware.biometrics.fingerprint</name>
- <transport>hwbinder</transport>
- <version>2.1</version>
- <interface>
- <name>IBiometricsFingerprint</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.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.audio</name>
- <transport>hwbinder</transport>
- <version>5.0</version>
- <interface>
- <name>IDevicesFactory</name>
- <instance>default</instance>
- </interface>
- </hal>
- <hal format="hidl">
- <name>android.hardware.keymaster</name>
- <transport>hwbinder</transport>
- <version>4.0</version>
- <interface>
- <name>IKeymasterDevice</name>
- <instance>default</instance>
- </interface>
- </hal>
- <hal format="hidl">
- <name>android.hardware.graphics.allocator</name>
- <transport>hwbinder</transport>
- <version>2.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>2.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>
- <!-- 2.0 for car builds -->
- <hal format="hidl">
- <name>android.hardware.broadcastradio</name>
- <transport>hwbinder</transport>
- <version>1.1</version>
- <interface>
- <name>IBroadcastRadioFactory</name>
- <instance>default</instance>
- </interface>
- </hal>
- <hal format="hidl">
- <name>android.hardware.camera.provider</name>
- <transport>hwbinder</transport>
- <version>2.4</version>
- <interface>
- <name>ICameraProvider</name>
- <instance>legacy/0</instance>
- <instance>internal/0</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.gnss</name>
- <transport>hwbinder</transport>
- <version>1.0</version>
- <interface>
- <name>IGnss</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.deprecated</name>
- <transport>hwbinder</transport>
- <version>1.0</version>
- <interface>
- <name>IOemHook</name>
- <instance>slot1</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.audiocontrol</name>
- <transport>hwbinder</transport>
- <version>1.0</version>
- <interface>
- <name>IAudioControl</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)
