Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b387fa2 authored by Trevor Black's avatar Trevor Black Committed by Automerger Merge Worker
Browse files

Merge "Add deqp.level-latest.xml to aosp" into main am: 15669af7 

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



Change-Id: Ic60ac1caec0ef01d9e827b24d30b8c1bfabd6e4e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents be840d27 15669af7

data/etc/Android.bp

+12 −0
Original line number Diff line number Diff line
@@ -358,6 +358,12 @@ prebuilt_etc { 
    defaults: ["frameworks_native_data_etc_defaults"],

}



prebuilt_etc {

    name: "android.software.opengles.deqp.level-latest.prebuilt.xml",

    src: "android.software.opengles.deqp.level-latest.xml",

    defaults: ["frameworks_native_data_etc_defaults"],

}



prebuilt_etc {

    name: "android.software.sip.voip.prebuilt.xml",

    src: "android.software.sip.voip.xml",
@@ -388,6 +394,12 @@ prebuilt_etc { 
    defaults: ["frameworks_native_data_etc_defaults"],

}



prebuilt_etc {

    name: "android.software.vulkan.deqp.level-latest.prebuilt.xml",

    src: "android.software.vulkan.deqp.level-latest.xml",

    defaults: ["frameworks_native_data_etc_defaults"],

}



prebuilt_etc {

    name: "aosp_excluded_hardware.prebuilt.xml",

    src: "aosp_excluded_hardware.xml",

data/etc/android.software.opengles.deqp.level-latest.xml

0 → 100644
+21 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright 2023 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<!-- This is the standard feature indicating that the device passes OpenGL ES

     dEQP tests associated with the most recent level for this Android version. -->

<permissions>

    <feature name="android.software.opengles.deqp.level" version="132580097" />

</permissions>

data/etc/android.software.vulkan.deqp.level-latest.xml

0 → 100644
+21 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright 2023 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<!-- This is the standard feature indicating that the device passes Vulkan

     dEQP tests associated with the most recent level for this Android version. -->

<permissions>

    <feature name="android.software.vulkan.deqp.level" version="132580097" />

</permissions>