diff options
author | Neil Fuller <nfuller@google.com> | 2021-06-21 14:56:34 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-06-21 14:56:34 +0000 |
commit | 53af90b7dd9e82f49df10c0c421f68cdc3e80e9c (patch) | |
tree | f1ec5808d5f55046f3357bdad4fae5eb8a2d6365 | |
parent | cb0a2a8c0bf2b829a8cc6a5c328661e266ab26fa (diff) | |
parent | b82fe937c52dcd66a6507b8515df6b57437f5388 (diff) | |
download | GeoTZ-android12-qpr3-s7-release.tar.gz |
Switch to API 31 after finalization am: b82fe937c5android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r11android-12.1.0_r10android12L-devandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-release
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/GeoTZ/+/14993595
Change-Id: Ibdcccc975e74cfaa503ee9c03b06e48a50dfeba4
-rw-r--r-- | apex/com.android.geotz/Android.bp | 6 | ||||
-rw-r--r-- | common/Android.bp | 8 | ||||
-rw-r--r-- | geotz_lookup/Android.bp | 8 | ||||
-rw-r--r-- | locationtzprovider/Android.bp | 4 | ||||
-rw-r--r-- | s2storage/Android.bp | 4 |
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", |