Merge changes from topic "cf-swiftshader-vk"
* changes:
Advertise Vulkan feature bits in Cuttlefish
Forward ro.hardware.vulkan prop during init
Set sepolicy for SwiftShader VK
Install SwiftShader's Vulkan lib in Cuttlefish
diff --git a/host_package.mk b/host_package.mk
index 6b1ba03..1eac968 100644
--- a/host_package.mk
+++ b/host_package.mk
@@ -50,7 +50,6 @@
cvd_status \
cvd_host_tests := \
- auto_free_buffer_test \
cuttlefish_thread_test \
monotonic_time_test \
cuttlefish_net_tests \
@@ -58,8 +57,6 @@
cvd_host_shared_libraries := \
libbase.so \
libcuttlefish_fs.so \
- cuttlefish_auto_resources.so \
- libcuttlefish_strings.so \
libcuttlefish_utils.so \
cuttlefish_tcp_socket.so \
cuttlefish_net.so \
diff --git a/shared/config/manifest.xml b/shared/config/manifest.xml
index be86d7f..51887e5 100644
--- a/shared/config/manifest.xml
+++ b/shared/config/manifest.xml
@@ -273,17 +273,6 @@
</interface>
-->
</hal>
- <!-- TODO (b/130076972):
- <hal format="hidl">
- <name>android.hardware.radio.config</name>
- <transport>hwbinder</transport>
- <version>1.2</version>
- <interface>
- <name>IRadioConfig</name>
- <instance>default</instance>
- </interface>
- </hal>
- -->
<!-- TODO (b/130079239):
<hal format="hidl">
<name>android.hardware.secure_element</name>
diff --git a/shared/device.mk b/shared/device.mk
index f37c76c..f68d2c5 100644
--- a/shared/device.mk
+++ b/shared/device.mk
@@ -276,6 +276,10 @@
PRODUCT_PACKAGES += \
android.hardware.input.classifier@1.0-service.default
+# Radio Config HAL
+PRODUCT_PACKAGES += \
+ android.hardware.radio.config@1.3-service
+
#
# Sensors
#
diff --git a/shared/sepolicy/vendor/file_contexts b/shared/sepolicy/vendor/file_contexts
index 79948a5..d58dac3 100644
--- a/shared/sepolicy/vendor/file_contexts
+++ b/shared/sepolicy/vendor/file_contexts
@@ -72,6 +72,7 @@
/vendor/bin/hw/android\.hardware\.input\.classifier@1\.0-service.default u:object_r:hal_input_classifier_default_exec:s0
/vendor/bin/hw/android\.hardware\.thermal@2\.0-service\.mock u:object_r:hal_thermal_default_exec:s0
/vendor/bin/hw/android\.hardware\.authsecret@1\.0-service u:object_r:hal_authsecret_default_exec:s0
+/vendor/bin/hw/android\.hardware\.radio\.config@1\.3-service u:object_r:hal_radio_config_default_exec:s0
/vendor/bin/init\.insmod\.sh u:object_r:init_insmod_sh_exec:s0
/vendor/lib(64)?/cuttlefish_auto_resources.so u:object_r:same_process_hal_file:s0
diff --git a/shared/sepolicy/vendor/priv_app.te b/shared/sepolicy/vendor/priv_app.te
index 48af07f..7de36ab 100644
--- a/shared/sepolicy/vendor/priv_app.te
+++ b/shared/sepolicy/vendor/priv_app.te
@@ -1,2 +1,6 @@
gpu_access(priv_app)
get_prop(priv_app, hal_camera_prop)
+# b/142672293: No other priv-app should need this allow rule now and GMS core runs in its own domain.
+userdebug_or_eng(`
+ auditallow priv_app hal_camera_prop:file { getattr open read map };
+')
diff --git a/vsoc_x86/phone/aosp_cf.mk b/vsoc_x86/phone/aosp_cf.mk
index e2230fc..2d75b08 100644
--- a/vsoc_x86/phone/aosp_cf.mk
+++ b/vsoc_x86/phone/aosp_cf.mk
@@ -44,6 +44,9 @@
$(call inherit-product, device/google/cuttlefish/vsoc_x86/device.mk)
+# Exclude features that are not available on AOSP devices.
+PRODUCT_COPY_FILES += \
+ frameworks/native/data/etc/aosp_excluded_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/aosp_excluded_hardware.xml
PRODUCT_NAME := aosp_cf_x86_phone
PRODUCT_DEVICE := vsoc_x86