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

Commit 35639e6f authored by Anvesh Renikindi's avatar Anvesh Renikindi Committed by Android (Google) Code Review
Browse files

Merge "Update to minSdkVersion 19 for tests." into udc-dev-plus-aosp

parents a6ed0bd3 904ff8d3

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

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




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

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





    sdk_version: "16",

    sdk_version: "19",





    javacflags: ["-nowarn"],

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

        enabled: false,

    },

    },





    min_sdk_version: "16",

    min_sdk_version: "19",

}
 
}

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

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

        enabled: false,

    },

    },





    min_sdk_version: "16",

    min_sdk_version: "19",

}

}





android_test_helper_app {

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

        enabled: false,

    },

    },





    min_sdk_version: "16",

    min_sdk_version: "19",

}
 
}

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

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




    javacflags: ["-nowarn"],

    javacflags: ["-nowarn"],





    min_sdk_version: "16",

    min_sdk_version: "19",





    instrumentation_for: "MultiDexLegacyTestApp",

    instrumentation_for: "MultiDexLegacyTestApp",

}
 
}

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

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




    javacflags: ["-nowarn"],

    javacflags: ["-nowarn"],





    min_sdk_version: "16",

    min_sdk_version: "19",





    instrumentation_for: "MultiDexLegacyTestApp",

    instrumentation_for: "MultiDexLegacyTestApp",

}

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




    javacflags: ["-nowarn"],

    javacflags: ["-nowarn"],





    min_sdk_version: "16",

    min_sdk_version: "19",





    instrumentation_for: "MultiDexLegacyTestApp",

    instrumentation_for: "MultiDexLegacyTestApp",

}
 
}

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

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

     android:versionCode="1"

     android:versionName="1.0">

     android:versionName="1.0">





    <uses-sdk android:minSdkVersion="18"

    <uses-sdk android:minSdkVersion="19"

         android:targetSdkVersion="18"/>

         android:targetSdkVersion="19"/>





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

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

         android:allowBackup="true"

         android:allowBackup="true"