summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-06-10 16:17:05 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-06-10 16:17:05 +0000
commit70c6a7adac01ba4869648701c9ff0ef3e7146dd5 (patch)
tree92857b65e9f4c0a39b6ca6b8c2dcfeebf5551258
parenta1fb87240d54192d1504dc2677736d8f9fb363b2 (diff)
parentb295a57ffb9d2d31a19ff24f3e673f621ec4a48b (diff)
downloadgoldfish-android13-mainline-go-adservices-release.tar.gz
Snap for 8708169 from b295a57ffb9d2d31a19ff24f3e673f621ec4a48b to mainline-go-adservices-releaseaml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000android13-mainline-go-adservices-release
Change-Id: Ia71761b6b7c847eaed6168f6f3bb53fa7d210b2e
Diffstat
-rw-r--r--64bitonly/manifest.xml18
-rw-r--r--64bitonly/product/vendor.mk7
-rw-r--r--data/etc/advancedFeatures.ini1
-rw-r--r--data/etc/advancedFeatures.ini.arm1
-rw-r--r--data/etc/advancedFeatures.ini.tablet1
-rw-r--r--data/etc/google/64bit/user/advancedFeatures.ini1
-rw-r--r--data/etc/google/64bit/user/arm64/advancedFeatures.ini1
-rw-r--r--data/etc/google/64bit/userdebug/advancedFeatures.ini1
-rw-r--r--data/etc/google/64bit/userdebug/arm64/advancedFeatures.ini1
-rw-r--r--data/etc/google/user/advancedFeatures.ini1
-rw-r--r--data/etc/google/user/arm64/advancedFeatures.ini1
-rw-r--r--data/etc/google/userdebug/advancedFeatures.ini1
-rw-r--r--data/etc/google/userdebug/arm64/advancedFeatures.ini1
-rw-r--r--emulator-info.txt2
-rw-r--r--init.ranchu.rc1
-rw-r--r--manifest.xml18
-rw-r--r--sepolicy/common/file_contexts5
-rw-r--r--vendor.mk7
18 files changed, 23 insertions, 46 deletions
diff --git a/64bitonly/manifest.xml b/64bitonly/manifest.xml
index 964fd245..99c702b6 100644
--- a/64bitonly/manifest.xml
+++ b/64bitonly/manifest.xml
@@ -42,24 +42,6 @@
</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.media.c2</name>
<transport>hwbinder</transport>
<version>1.1</version>
diff --git a/64bitonly/product/vendor.mk b/64bitonly/product/vendor.mk
index 213ae0dd..c1158aa7 100644
--- a/64bitonly/product/vendor.mk
+++ b/64bitonly/product/vendor.mk
@@ -51,8 +51,8 @@ PRODUCT_PACKAGES += \
qemu-props \
stagefright \
android.hardware.graphics.composer@2.4-service \
- android.hardware.graphics.allocator@3.0-service \
- android.hardware.graphics.mapper@3.0-impl-ranchu \
+ android.hardware.graphics.allocator@4.0-service.minigbm \
+ android.hardware.graphics.mapper@4.0-impl.minigbm \
hwcomposer.ranchu \
toybox_vendor \
android.hardware.wifi@1.0-service \
@@ -111,8 +111,7 @@ PRODUCT_PACKAGES += \
PRODUCT_PACKAGES += \
android.hardware.security.keymint-service
PRODUCT_COPY_FILES += \
- frameworks/native/data/etc/android.hardware.keystore.app_attest_key.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.keystore.app_attest_key.xml \
- frameworks/native/data/etc/android.software.device_id_attestation.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.device_id_attestation.xml
+ frameworks/native/data/etc/android.hardware.keystore.app_attest_key.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.keystore.app_attest_key.xml
PRODUCT_PACKAGES += \
DisplayCutoutEmulationEmu01Overlay \
diff --git a/data/etc/advancedFeatures.ini b/data/etc/advancedFeatures.ini
index f16a3b55..5421feb3 100644
--- a/data/etc/advancedFeatures.ini
+++ b/data/etc/advancedFeatures.ini
@@ -28,3 +28,4 @@ VulkanBatchedDescriptorSetUpdate = on
DeviceStateOnBoot = on
HWCMultiConfigs = on
VirtioSndCard = on
+Minigbm = on
diff --git a/data/etc/advancedFeatures.ini.arm b/data/etc/advancedFeatures.ini.arm
index 5620f62d..12e195a2 100644
--- a/data/etc/advancedFeatures.ini.arm
+++ b/data/etc/advancedFeatures.ini.arm
@@ -26,3 +26,4 @@ VulkanQueueSubmitWithCommands = on
VulkanBatchedDescriptorSetUpdate = on
DeviceStateOnBoot = on
VirtioSndCard = on
+Minigbm = on
diff --git a/data/etc/advancedFeatures.ini.tablet b/data/etc/advancedFeatures.ini.tablet
index 3f53b8b5..896144f5 100644
--- a/data/etc/advancedFeatures.ini.tablet
+++ b/data/etc/advancedFeatures.ini.tablet
@@ -26,3 +26,4 @@ VulkanQueueSubmitWithCommands = on
VulkanBatchedDescriptorSetUpdate = on
DeviceStateOnBoot = on
VirtioSndCard = on
+Minigbm = on
diff --git a/data/etc/google/64bit/user/advancedFeatures.ini b/data/etc/google/64bit/user/advancedFeatures.ini
index 7d633d6f..1f9485db 100644
--- a/data/etc/google/64bit/user/advancedFeatures.ini
+++ b/data/etc/google/64bit/user/advancedFeatures.ini
@@ -28,3 +28,4 @@ VulkanQueueSubmitWithCommands = on
VulkanBatchedDescriptorSetUpdate = on
DeviceStateOnBoot = on
VirtioSndCard = on
+Minigbm = on
diff --git a/data/etc/google/64bit/user/arm64/advancedFeatures.ini b/data/etc/google/64bit/user/arm64/advancedFeatures.ini
index 953f4118..23b40128 100644
--- a/data/etc/google/64bit/user/arm64/advancedFeatures.ini
+++ b/data/etc/google/64bit/user/arm64/advancedFeatures.ini
@@ -27,3 +27,4 @@ VulkanQueueSubmitWithCommands = on
VulkanBatchedDescriptorSetUpdate = on
DeviceStateOnBoot = on
VirtioSndCard = on
+Minigbm = on
diff --git a/data/etc/google/64bit/userdebug/advancedFeatures.ini b/data/etc/google/64bit/userdebug/advancedFeatures.ini
index 1fbdaa7a..9ee32d6a 100644
--- a/data/etc/google/64bit/userdebug/advancedFeatures.ini
+++ b/data/etc/google/64bit/userdebug/advancedFeatures.ini
@@ -28,3 +28,4 @@ VulkanBatchedDescriptorSetUpdate = on
DeviceStateOnBoot = on
HWCMultiConfigs = on
VirtioSndCard = on
+Minigbm = on
diff --git a/data/etc/google/64bit/userdebug/arm64/advancedFeatures.ini b/data/etc/google/64bit/userdebug/arm64/advancedFeatures.ini
index 61210438..89e78670 100644
--- a/data/etc/google/64bit/userdebug/arm64/advancedFeatures.ini
+++ b/data/etc/google/64bit/userdebug/arm64/advancedFeatures.ini
@@ -27,3 +27,4 @@ VulkanBatchedDescriptorSetUpdate = on
DeviceStateOnBoot = on
HWCMultiConfigs = on
VirtioSndCard = on
+Minigbm = on
diff --git a/data/etc/google/user/advancedFeatures.ini b/data/etc/google/user/advancedFeatures.ini
index 6b6310b2..8bbd050e 100644
--- a/data/etc/google/user/advancedFeatures.ini
+++ b/data/etc/google/user/advancedFeatures.ini
@@ -28,3 +28,4 @@ VulkanQueueSubmitWithCommands = on
VulkanBatchedDescriptorSetUpdate = on
DeviceStateOnBoot = on
VirtioSndCard = on
+Minigbm = on
diff --git a/data/etc/google/user/arm64/advancedFeatures.ini b/data/etc/google/user/arm64/advancedFeatures.ini
index bf580716..c1ca91cf 100644
--- a/data/etc/google/user/arm64/advancedFeatures.ini
+++ b/data/etc/google/user/arm64/advancedFeatures.ini
@@ -27,3 +27,4 @@ VulkanQueueSubmitWithCommands = on
VulkanBatchedDescriptorSetUpdate = on
DeviceStateOnBoot = on
VirtioSndCard = on
+Minigbm = on
diff --git a/data/etc/google/userdebug/advancedFeatures.ini b/data/etc/google/userdebug/advancedFeatures.ini
index bff24445..3b38bb7b 100644
--- a/data/etc/google/userdebug/advancedFeatures.ini
+++ b/data/etc/google/userdebug/advancedFeatures.ini
@@ -28,3 +28,4 @@ VulkanBatchedDescriptorSetUpdate = on
DeviceStateOnBoot = on
HWCMultiConfigs = on
VirtioSndCard = on
+Minigbm = on
diff --git a/data/etc/google/userdebug/arm64/advancedFeatures.ini b/data/etc/google/userdebug/arm64/advancedFeatures.ini
index 8504de5e..367f994a 100644
--- a/data/etc/google/userdebug/arm64/advancedFeatures.ini
+++ b/data/etc/google/userdebug/arm64/advancedFeatures.ini
@@ -27,3 +27,4 @@ VulkanBatchedDescriptorSetUpdate = on
DeviceStateOnBoot = on
HWCMultiConfigs = on
VirtioSndCard = on
+Minigbm = on
diff --git a/emulator-info.txt b/emulator-info.txt
index 772a875a..13def537 100644
--- a/emulator-info.txt
+++ b/emulator-info.txt
@@ -1,2 +1,2 @@
# Emulator (stable) version
-require version-emulator=8499664
+require version-emulator=8681204
diff --git a/init.ranchu.rc b/init.ranchu.rc
index ffcebbaa..a9e6699d 100644
--- a/init.ranchu.rc
+++ b/init.ranchu.rc
@@ -11,6 +11,7 @@ on late-fs
on early-init
mount proc proc /proc remount hidepid=2,gid=3009
setprop ro.hardware.vulkan ranchu
+ setprop ro.hardware.gralloc minigbm
# true if ram is <= 2G
setprop ro.config.low_ram ${ro.boot.config.low_ram}
diff --git a/manifest.xml b/manifest.xml
index 1d2e7c8a..8d7479b7 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -42,24 +42,6 @@
</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.media.c2</name>
<transport>hwbinder</transport>
<version>1.0</version>
diff --git a/sepolicy/common/file_contexts b/sepolicy/common/file_contexts
index a999cc26..77da0508 100644
--- a/sepolicy/common/file_contexts
+++ b/sepolicy/common/file_contexts
@@ -62,8 +62,11 @@
/vendor/lib(64)?/libvulkan_enc\.so u:object_r:same_process_hal_file:s0
/vendor/lib(64)?/libandroidemu\.so u:object_r:same_process_hal_file:s0
/vendor/lib(64)?/libdrm.so u:object_r:same_process_hal_file:s0
-/vendor/lib(64)?/hw/android\.hardware\.graphics\.mapper@3\.0-impl-ranchu\.so u:object_r:same_process_hal_file:s0
/vendor/lib(64)?/libGoldfishProfiler\.so u:object_r:same_process_hal_file:s0
+/vendor/lib(64)?/dri/.* u:object_r:same_process_hal_file:s0
+/vendor/lib(64)?/hw/android\.hardware\.graphics\.mapper@4\.0-impl\.minigbm\.so u:object_r:same_process_hal_file:s0
+/vendor/lib(64)?/libminigbm_gralloc.so u:object_r:same_process_hal_file:s0
+/vendor/bin/hw/android\.hardware\.graphics\.allocator@4\.0-service\.minigbm u:object_r:hal_graphics_allocator_default_exec:s0
# data
/data/vendor/mediadrm(/.*)? u:object_r:mediadrm_vendor_data_file:s0
diff --git a/vendor.mk b/vendor.mk
index a3d4d153..b1bf8d9d 100644
--- a/vendor.mk
+++ b/vendor.mk
@@ -46,8 +46,8 @@ PRODUCT_PACKAGES += \
qemu-props \
stagefright \
android.hardware.graphics.composer@2.4-service \
- android.hardware.graphics.allocator@3.0-service \
- android.hardware.graphics.mapper@3.0-impl-ranchu \
+ android.hardware.graphics.allocator@4.0-service.minigbm \
+ android.hardware.graphics.mapper@4.0-impl.minigbm \
hwcomposer.ranchu \
toybox_vendor \
android.hardware.wifi@1.0-service \
@@ -109,8 +109,7 @@ PRODUCT_PACKAGES += \
PRODUCT_PACKAGES += \
android.hardware.security.keymint-service
PRODUCT_COPY_FILES += \
- frameworks/native/data/etc/android.hardware.keystore.app_attest_key.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.keystore.app_attest_key.xml \
- frameworks/native/data/etc/android.software.device_id_attestation.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.device_id_attestation.xml
+ frameworks/native/data/etc/android.hardware.keystore.app_attest_key.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.keystore.app_attest_key.xml
PRODUCT_PACKAGES += \
DisplayCutoutEmulationEmu01Overlay \
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-07 08:54:33 +0000