diff options
| author | Victor Chang <vichang@google.com> | 2024-03-07 14:02:23 +0000 |
|---|---|---|
| committer | Victor Chang <vichang@google.com> | 2024-03-08 09:34:46 +0000 |
| commit | a0536cfec2a19962e9508b192a4a8ecc62323fbd (patch) | |
| tree | 3090266629fca8fd535fb64a6be000d8688758d4 | |
| parent | f802236bedb23df9e58def9eb2d513904f1f6396 (diff) | |
| download | conscrypt-a0536cfec2a19962e9508b192a4a8ecc62323fbd.tar.gz | |
Add minSdkVersion="30" to Conscrypt APEX
Android Q is no longer supported. The min SDK version supported is
Android R.
Bug: 328586051
Bug: 148281152
Test: treehugger
Change-Id: Ib48f9c1aeccad69746a9de4d9a311fddd6a87d5b
| -rw-r--r-- | Android.bp | 6 | ||||
| -rw-r--r-- | apex/AndroidManifest.xml | 9 | ||||
| -rw-r--r-- | apex/tests/AndroidManifest.xml | 2 |
3 files changed, 6 insertions, 11 deletions
@@ -238,8 +238,8 @@ java_library { "com.android.conscrypt", "test_com.android.conscrypt", ], - // Conscrypt should support Q - min_sdk_version: "29", + // Conscrypt should support R + min_sdk_version: "30", installable: true, // Hostdex is only for ART testing on host: ART build file has its @@ -550,7 +550,7 @@ cc_library_shared { "com.android.conscrypt", "test_com.android.conscrypt", ], - min_sdk_version: "29", + min_sdk_version: "30", } // Unbundled Conscrypt jar for use by signapk and apksigner tool diff --git a/apex/AndroidManifest.xml b/apex/AndroidManifest.xml index a38cb9b6..dea0c5e3 100644 --- a/apex/AndroidManifest.xml +++ b/apex/AndroidManifest.xml @@ -21,11 +21,6 @@ <!-- * API levels the Conscrypt APEX is known to work with. --> - <!-- TODO: Uncomment this when the R API level is fixed. b/148281152 --> - <!--uses-sdk - android:minSdkVersion="29" - android:maxSdkVersion="29" - android:targetSdkVersion="29" - /> - --> + <uses-sdk + android:minSdkVersion="30"/> <!-- Android R --> </manifest> diff --git a/apex/tests/AndroidManifest.xml b/apex/tests/AndroidManifest.xml index 7ec61f85..8f932eb1 100644 --- a/apex/tests/AndroidManifest.xml +++ b/apex/tests/AndroidManifest.xml @@ -18,7 +18,7 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.android.conscrypt.mts"> - <uses-sdk android:minSdkVersion="29" android:targetSdkVersion="29" /> + <uses-sdk android:minSdkVersion="30" android:targetSdkVersion="30" /> <uses-permission android:name="android.permission.INTERNET" /> <application> |