diff options
| author | Remi NGUYEN VAN <reminv@google.com> | 2019-12-13 07:05:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-12-13 07:05:30 +0000 |
| commit | c13b4ca45c39fb45fa2495bc2c4217e084e437c3 (patch) | |
| tree | f5703138c16d4e1c0f56089e9d6ab7f2207931ab | |
| parent | 859ceabd04daece392d42d37dbc2092cb88996f1 (diff) | |
| parent | a42c9483812605897415a68b8637b94a17fd05c9 (diff) | |
Merge "Set min_sdk to 29 for NetworkStack tests"
| -rw-r--r-- | tests/integration/Android.bp | 1 | ||||
| -rw-r--r-- | tests/integration/AndroidManifest.xml | 1 | ||||
| -rw-r--r-- | tests/unit/Android.bp | 1 | ||||
| -rw-r--r-- | tests/unit/AndroidManifest.xml | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/tests/integration/Android.bp b/tests/integration/Android.bp index fdc9a53..3aac230 100644 --- a/tests/integration/Android.bp +++ b/tests/integration/Android.bp @@ -17,6 +17,7 @@ android_test { name: "NetworkStackIntegrationTests", certificate: "networkstack", + min_sdk_version: "29", srcs: ["src/**/*.java"], test_suites: ["device-tests"], static_libs: [ diff --git a/tests/integration/AndroidManifest.xml b/tests/integration/AndroidManifest.xml index bfd3735..12f5d7d 100644 --- a/tests/integration/AndroidManifest.xml +++ b/tests/integration/AndroidManifest.xml @@ -16,6 +16,7 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.android.server.networkstack.integrationtests" android:sharedUserId="android.uid.networkstack"> + <uses-sdk android:minSdkVersion="29" android:targetSdkVersion="29" /> <!-- Note: do not add any privileged or signature permissions that are granted to the network stack app. Otherwise, the test APK will install, but when the device is diff --git a/tests/unit/Android.bp b/tests/unit/Android.bp index a63bc61..7e69e02 100644 --- a/tests/unit/Android.bp +++ b/tests/unit/Android.bp @@ -50,6 +50,7 @@ android_test { android_test { name: "NetworkStackTests", + min_sdk_version: "29", test_suites: ["device-tests"], defaults: ["NetworkStackTestsDefaults"], static_libs: ["NetworkStackApiStableLib"], diff --git a/tests/unit/AndroidManifest.xml b/tests/unit/AndroidManifest.xml index 5dcf6ff..c7ea774 100644 --- a/tests/unit/AndroidManifest.xml +++ b/tests/unit/AndroidManifest.xml @@ -15,6 +15,7 @@ --> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.android.server.networkstack.tests"> + <uses-sdk android:minSdkVersion="29" android:targetSdkVersion="29" /> <uses-permission android:name="android.permission.READ_LOGS" /> <uses-permission android:name="android.permission.WRITE_SETTINGS" /> |