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

Commit b00b63b1 authored by Anton Hansson's avatar Anton Hansson Committed by Automerger Merge Worker
Browse files

Merge "Add more test-cases for <extension-sdk>" into sc-dev am: f288c41d 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13690793

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0383db0a5b75298aa6b012d9e7949439b8c40945
parents 6b610456 f288c41d

services/tests/servicestests/Android.bp

+4 −1
Original line number Diff line number Diff line
@@ -181,9 +181,12 @@ java_genrule { 
        ":FrameworksServicesTests_install_split_feature_a",

        ":FrameworksServicesTests_install_uses_sdk_0",

        ":FrameworksServicesTests_install_uses_sdk_q0",

        ":FrameworksServicesTests_install_uses_sdk_r",

        ":FrameworksServicesTests_install_uses_sdk_q0_r0",

        ":FrameworksServicesTests_install_uses_sdk_r_none",

        ":FrameworksServicesTests_install_uses_sdk_r0",

        ":FrameworksServicesTests_install_uses_sdk_r5",

        ":FrameworksServicesTests_install_uses_sdk_r0_s0",

        ":FrameworksServicesTests_install_uses_sdk_r0_s5",

    ],

    out: ["FrameworkServicesTests_apks_as_resources.res.zip"],

    tools: ["soong_zip"],

services/tests/servicestests/apks/install_uses_sdk/Android.bp

+22 −14
Original line number Diff line number Diff line
@@ -7,42 +7,50 @@ package { 
    default_applicable_licenses: ["frameworks_base_license"],

}



android_test_helper_app {

    name: "FrameworksServicesTests_install_uses_sdk_q0",

    defaults: ["FrameworksServicesTests_apks_defaults"],

    manifest: "AndroidManifest-q0.xml",

}



android_test_helper_app {

    name: "FrameworksServicesTests_install_uses_sdk_q0_r0",

    defaults: ["FrameworksServicesTests_apks_defaults"],

    manifest: "AndroidManifest-q0-r0.xml",

}



android_test_helper_app {

    name: "FrameworksServicesTests_install_uses_sdk_r_none",

    defaults: ["FrameworksServicesTests_apks_defaults"],

    manifest: "AndroidManifest-r-none.xml",

}



android_test_helper_app {

    name: "FrameworksServicesTests_install_uses_sdk_r0",

    defaults: ["FrameworksServicesTests_apks_defaults"],

    manifest: "AndroidManifest-r0.xml",



    srcs: ["**/*.java"],

}



android_test_helper_app {

    name: "FrameworksServicesTests_install_uses_sdk_r5",

    defaults: ["FrameworksServicesTests_apks_defaults"],

    manifest: "AndroidManifest-r5.xml",



    srcs: ["**/*.java"],

}



android_test_helper_app {

    name: "FrameworksServicesTests_install_uses_sdk_q0",

    name: "FrameworksServicesTests_install_uses_sdk_r0_s0",

    defaults: ["FrameworksServicesTests_apks_defaults"],

    manifest: "AndroidManifest-q0.xml",



    srcs: ["**/*.java"],

    manifest: "AndroidManifest-r0-s0.xml",

}



android_test_helper_app {

    name: "FrameworksServicesTests_install_uses_sdk_r",

    name: "FrameworksServicesTests_install_uses_sdk_r0_s5",

    defaults: ["FrameworksServicesTests_apks_defaults"],

    manifest: "AndroidManifest-r.xml",



    srcs: ["**/*.java"],

    manifest: "AndroidManifest-r0-s5.xml",

}



android_test_helper_app {

    name: "FrameworksServicesTests_install_uses_sdk_0",

    defaults: ["FrameworksServicesTests_apks_defaults"],

    manifest: "AndroidManifest-0.xml",



    srcs: ["**/*.java"],

}

services/tests/servicestests/apks/install_uses_sdk/AndroidManifest-0.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 


    <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="29">

        <!-- This is invalid, because there is no sdk version specified -->

        <extension-sdk android:minExtensionVersion="5" />

        <extension-sdk android:minExtensionVersion="0" />

    </uses-sdk>



    <application>

services/tests/servicestests/apks/install_uses_sdk/AndroidManifest-q0-r0.xml

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

<!-- Copyright (C) 2010 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.

-->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"

        package="com.android.frameworks.servicestests.install_uses_sdk">



    <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="29">

        <!-- This fails because 29 doesn't have an extension sdk -->

        <extension-sdk android:sdkVersion="29" android:minExtensionVersion="0" />

        <extension-sdk android:sdkVersion="30" android:minExtensionVersion="0" />

    </uses-sdk>



    <application>

    </application>

</manifest>

services/tests/servicestests/apks/install_uses_sdk/AndroidManifest-r.xml→services/tests/servicestests/apks/install_uses_sdk/AndroidManifest-r-none.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 


    <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="29">

        <!-- This is invalid, because there is no minimum extension version specified -->

        <extension-sdk android:sdkVersion="10000" />

        <extension-sdk android:sdkVersion="30" />

    </uses-sdk>



    <application>