Switch to API 31 after finalization am: b82fe937c5android-mainline-12.0.0_r99android-mainline-12.0.0_r98android-mainline-12.0.0_r96android-mainline-12.0.0_r95android-mainline-12.0.0_r94android-mainline-12.0.0_r93android-mainline-12.0.0_r92android-mainline-12.0.0_r84android-mainline-12.0.0_r83android-mainline-12.0.0_r82android-mainline-12.0.0_r81android-mainline-12.0.0_r80android-mainline-12.0.0_r8android-mainline-12.0.0_r79android-mainline-12.0.0_r78android-mainline-12.0.0_r77android-mainline-12.0.0_r70android-mainline-12.0.0_r69android-mainline-12.0.0_r67android-mainline-12.0.0_r66android-mainline-12.0.0_r65android-mainline-12.0.0_r64android-mainline-12.0.0_r63android-mainline-12.0.0_r6android-mainline-12.0.0_r59android-mainline-12.0.0_r58android-mainline-12.0.0_r57android-mainline-12.0.0_r56android-mainline-12.0.0_r53android-mainline-12.0.0_r52android-mainline-12.0.0_r51android-mainline-12.0.0_r50android-mainline-12.0.0_r5android-mainline-12.0.0_r49android-mainline-12.0.0_r42android-mainline-12.0.0_r40android-mainline-12.0.0_r39android-mainline-12.0.0_r38android-mainline-12.0.0_r37android-mainline-12.0.0_r35android-mainline-12.0.0_r34android-mainline-12.0.0_r33android-mainline-12.0.0_r32android-mainline-12.0.0_r3android-mainline-12.0.0_r25android-mainline-12.0.0_r23android-mainline-12.0.0_r22android-mainline-12.0.0_r20android-mainline-12.0.0_r19android-mainline-12.0.0_r18android-mainline-12.0.0_r17android-mainline-12.0.0_r16android-mainline-12.0.0_r15android-mainline-12.0.0_r14android-mainline-12.0.0_r126android-mainline-12.0.0_r125android-mainline-12.0.0_r124android-mainline-12.0.0_r123android-mainline-12.0.0_r122android-mainline-12.0.0_r115android-mainline-12.0.0_r114android-mainline-12.0.0_r113android-mainline-12.0.0_r110android-mainline-12.0.0_r109android-mainline-12.0.0_r108android-mainline-12.0.0_r107android-mainline-12.0.0_r100aml_wif_311811030aml_tz3_311312010aml_tet_311811050aml_sdk_311710000aml_pco_311011000android12-mainline-wifi-releaseandroid12-mainline-tethering-releaseandroid12-mainline-statsd-releaseandroid12-mainline-sdkext-releaseandroid12-mainline-resolv-releaseandroid12-mainline-permission-releaseandroid12-mainline-neuralnetworks-releaseandroid12-mainline-networkstack-releaseandroid12-mainline-conscrypt-releaseandroid12-mainline-captiveportallogin-releaseandroid12-mainline-art-release

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/GeoTZ/+/14993595

Change-Id: I0cf37e5a4cd50c16b7e43982d62e9353b3ecdf46

5 files changed, 14 insertions, 16 deletions

diff --git a/apex/com.android.geotz/Android.bp b/apex/com.android.geotz/Android.bp
index 145988d..f4e9bbc 100644
--- a/apex/com.android.geotz/Android.bp
+++ b/apex/com.android.geotz/Android.bp
@@ -21,9 +21,7 @@ apex_defaults {
     name: "com.android.geotz-defaults",
     updatable: true,
     generate_hashtree: false,
-    // TODO(b/174024269) Change this to the value for S once the API level is
-    // final.
-    min_sdk_version: "current",
+    min_sdk_version: "31",
 
     // Explicit because the defaulting behavior only works for the real
     // module.
@@ -77,7 +75,7 @@ java_library {
     static_libs: [
         "offlinelocationtimezoneprovider",
     ],
-    sdk_version: "system_current",
+    sdk_version: "system_31",
     // TODO(b/188773212): force dex compilation for inclusion in bootclasspath_fragment.
     compile_dex: true,
     apex_available: [
diff --git a/common/Android.bp b/common/Android.bp
index dbb149b..c64e06d 100644
--- a/common/Android.bp
+++ b/common/Android.bp
@@ -29,8 +29,8 @@ java_library {
     host_supported: true,
     srcs: ["src/main/java/**/*.java"],
     libs: ["androidx.annotation_annotation"],
-    sdk_version: "current",
-    min_sdk_version: "current",
+    sdk_version: "31",
+    min_sdk_version: "31",
     apex_available: [
         "com.android.geotz",
     ],
@@ -41,8 +41,8 @@ android_test {
     name: "GeotzCommonTests",
     srcs: ["src/test/java/**/*.java"],
     manifest: "src/test/AndroidManifest.xml",
-    sdk_version: "current",
-    min_sdk_version: "current",
+    sdk_version: "31",
+    min_sdk_version: "31",
     static_libs: [
         "androidx.test.runner",
         "geotz_lookup",
diff --git a/geotz_lookup/Android.bp b/geotz_lookup/Android.bp
index 4b4c436..9ef4f7d 100644
--- a/geotz_lookup/Android.bp
+++ b/geotz_lookup/Android.bp
@@ -20,8 +20,8 @@ package {
 java_library {
     name: "geotz_lookup",
     srcs: ["src/main/java/**/*.java"],
-    sdk_version: "current",
-    min_sdk_version: "current",
+    sdk_version: "31",
+    min_sdk_version: "31",
     libs: ["androidx.annotation_annotation"],
     static_libs: [
         "geotz_common",
@@ -40,8 +40,8 @@ android_test {
     name: "GeotzLookupTests",
     srcs: ["src/test/java/**/*.java"],
     manifest: "src/test/AndroidManifest.xml",
-    sdk_version: "current",
-    min_sdk_version: "current",
+    sdk_version: "31",
+    min_sdk_version: "31",
     static_libs: [
         "androidx.test.runner",
         "geotz_lookup",
diff --git a/locationtzprovider/Android.bp b/locationtzprovider/Android.bp
index 63fa3d7..a6c560b 100644
--- a/locationtzprovider/Android.bp
+++ b/locationtzprovider/Android.bp
@@ -21,7 +21,7 @@ package {
 java_library {
     name: "offlinelocationtimezoneprovider",
     srcs: ["src/main/java/**/*.java"],
-    sdk_version: "system_current",
+    sdk_version: "system_31",
     libs: [
         "androidx.annotation_annotation",
     ],
@@ -39,7 +39,7 @@ android_test {
     name: "OfflineLocationTimeZoneProviderTests",
     srcs: ["src/test/java/**/*.java"],
     manifest: "src/test/AndroidManifest.xml",
-    sdk_version: "system_current",
+    sdk_version: "system_31",
     static_libs: [
         "androidx.test.runner",
         "junit",
diff --git a/s2storage/Android.bp b/s2storage/Android.bp
index f4be5ca..bf5c2c8 100644
--- a/s2storage/Android.bp
+++ b/s2storage/Android.bp
@@ -19,8 +19,8 @@ package {
 
 java_library {
     name: "geotz_s2storage_ro",
-    sdk_version: "current",
-    min_sdk_version: "current",
+    sdk_version: "31",
+    min_sdk_version: "31",
     host_supported: true,
     srcs: [
         "src/readonly/java/**/*.java",