Snap for 7479185 from 53af90b7dd9e82f49df10c0c421f68cdc3e80e9c to sc-v2-release
Change-Id: I9a1af551037523b642b6458b93c66b8351b890f8
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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",