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

Commit b386f83b authored by Anvesh Renikindi's avatar Anvesh Renikindi Committed by Automerger Merge Worker
Browse files

Merge "Update to minSdkVersion 19 for tests." into udc-dev-plus-aosp am: 35639e6f 

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



Change-Id: I08ffe2138803bde78e898df1f208903d195bf5b3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 126f1267 35639e6f

core/tests/hosttests/test-apps/MultiDexLegacyAndException/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ android_test_helper_app { 


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



    sdk_version: "16",

    sdk_version: "19",



    javacflags: ["-nowarn"],
@@ -43,5 +43,5 @@ android_test_helper_app { 
        enabled: false,

    },



    min_sdk_version: "16",

    min_sdk_version: "19",

}

core/tests/hosttests/test-apps/MultiDexLegacyTestApp/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ android_test_helper_app { 
        enabled: false,

    },



    min_sdk_version: "16",

    min_sdk_version: "19",

}



android_test_helper_app {
@@ -66,5 +66,5 @@ android_test_helper_app { 
        enabled: false,

    },



    min_sdk_version: "16",

    min_sdk_version: "19",

}

core/tests/hosttests/test-apps/MultiDexLegacyTestAppTests/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ android_test { 


    javacflags: ["-nowarn"],



    min_sdk_version: "16",

    min_sdk_version: "19",



    instrumentation_for: "MultiDexLegacyTestApp",

}

core/tests/hosttests/test-apps/MultiDexLegacyTestAppTests2/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ android_test { 


    javacflags: ["-nowarn"],



    min_sdk_version: "16",

    min_sdk_version: "19",



    instrumentation_for: "MultiDexLegacyTestApp",

}
@@ -51,7 +51,7 @@ android_test { 


    javacflags: ["-nowarn"],



    min_sdk_version: "16",

    min_sdk_version: "19",



    instrumentation_for: "MultiDexLegacyTestApp",

}

core/tests/hosttests/test-apps/MultiDexLegacyTestAppWithCorruptedDex/AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -5,8 +5,8 @@ 
     android:versionCode="1"

     android:versionName="1.0">



    <uses-sdk android:minSdkVersion="18"

         android:targetSdkVersion="18"/>

    <uses-sdk android:minSdkVersion="19"

         android:targetSdkVersion="19"/>



    <application android:name="androidx.multidex.MultiDexApplication"

         android:allowBackup="true"