commit ce9b97eb66e76604bbe9881c041a820722e83146
author Paul Thomson <paulthomson@google.com> Thu Apr 14 16:59:59 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Apr 14 16:59:59 2022 +0000
tree 953d7b9bfa04ba7406e915bf1250dd0370287210
parent 4c0835074c60081166ab41945e3dbcceb7f55f1f
parent 4809267e7b873d1c12b45a975163a3d934d1a0f3

Merge "Add dEQP level 2022 prebuilts" am: 1fe267fe1f am: 5ea4b47fc6 am: ff1a809a7f am: 4809267e7b

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2059692

Change-Id: If46873e2bceaf423e616bb43e0f75d46a3299386
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

data/etc/Android.bp

diff --git a/data/etc/Android.bp b/data/etc/Android.bp
index 5003151..bdd5172 100644
--- a/data/etc/Android.bp
+++ b/data/etc/Android.bp
@@ -227,6 +227,12 @@
 }
 
 prebuilt_etc {
+    name: "android.software.opengles.deqp.level-2022-03-01.prebuilt.xml",
+    src: "android.software.opengles.deqp.level-2022-03-01.xml",
+    defaults: ["frameworks_native_data_etc_defaults"],
+}
+
+prebuilt_etc {
     name: "android.software.sip.voip.prebuilt.xml",
     src: "android.software.sip.voip.xml",
     defaults: ["frameworks_native_data_etc_defaults"],
@@ -245,6 +251,12 @@
 }
 
 prebuilt_etc {
+    name: "android.software.vulkan.deqp.level-2022-03-01.prebuilt.xml",
+    src: "android.software.vulkan.deqp.level-2022-03-01.xml",
+    defaults: ["frameworks_native_data_etc_defaults"],
+}
+
+prebuilt_etc {
     name: "aosp_excluded_hardware.prebuilt.xml",
     src: "aosp_excluded_hardware.xml",
     defaults: ["frameworks_native_data_etc_defaults"],