commit ff1a809a7ff55778e6287b63a75a6c8436a4a316
author Paul Thomson <paulthomson@google.com> Thu Apr 14 16:35:02 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Apr 14 16:35:02 2022 +0000
tree 58d09e95ee0ae93ba13330d7f395cc9d5d7cd621
parent f113345e144128033d35d6201e3022f5482a4189
parent 5ea4b47fc6150fc818c98ba3057539c7d44ca501

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

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

Change-Id: I69bfe32773cc4636c2329e11942c2252f76005bf
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 c901c59..34d53a5 100644
--- a/data/etc/Android.bp
+++ b/data/etc/Android.bp
@@ -221,6 +221,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"],
@@ -239,6 +245,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"],