[automerger skipped] DO NOT MERGE Create a boot-looping version of the tzdata apex. [Q] am: 69104e82ed -s ours am: 242abb6496 -s ours
am skip reason: Change-Id Ia4d0a0ff8e3d31ff49d692584d25674b9af31ebc with SHA-1 42d819d0ed is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/timezone/+/13229448
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1465ddad70a100c89ac027d3d79fd23fbeff2b49
diff --git a/apex/Android.bp b/apex/Android.bp
index 1ff0743..9fece58 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -16,7 +16,7 @@
apex_defaults {
name: "com.android.tzdata-defaults",
updatable: true,
- min_sdk_version: "R",
+ min_sdk_version: "30",
// Use a custom AndroidManifest.xml used for API targeting.
androidManifest: ":com.android.tzdata-androidManifest",
diff --git a/apex/manifest.json b/apex/manifest.json
index c1bdf6a..873fbc4 100644
--- a/apex/manifest.json
+++ b/apex/manifest.json
@@ -1,4 +1,4 @@
{
"name": "com.android.tzdata",
- "version": 300000000
+ "version": 309999900
}
diff --git a/apex/tests/Android.bp b/apex/tests/Android.bp
index d5c524b..ef35edd 100644
--- a/apex/tests/Android.bp
+++ b/apex/tests/Android.bp
@@ -28,7 +28,7 @@
// Tag this module as an mts test artifact
test_suites: [
"general-tests",
- "mts",
+ "mts-tzdata",
],
min_sdk_version: "29",
}