Revert^2 "Give pom2bp -default-min-sdk-version 24 param"
863a392b2cda2c79201d5329dc24a190f49fee3b
Change-Id: If96d34ae3aefcf7c7cb191da4ab6618c910895f2
diff --git a/current/androidx/Android.bp b/current/androidx/Android.bp
index 8abf77f..e84ddb4 100644
--- a/current/androidx/Android.bp
+++ b/current/androidx/Android.bp
@@ -104,6 +104,7 @@
"//apex_available:platform",
"//apex_available:anyapex",
],
+ min_sdk_version: "24",
}
java_library_static {
@@ -215,6 +216,7 @@
"//apex_available:platform",
"//apex_available:anyapex",
],
+ min_sdk_version: "24",
}
java_library_static {
@@ -446,6 +448,7 @@
"//apex_available:platform",
"//apex_available:anyapex",
],
+ min_sdk_version: "24",
}
java_library_static {
@@ -472,6 +475,7 @@
"//apex_available:platform",
"//apex_available:anyapex",
],
+ min_sdk_version: "24",
}
java_library_static {
@@ -497,6 +501,7 @@
"//apex_available:platform",
"//apex_available:anyapex",
],
+ min_sdk_version: "24",
}
java_library_static {
@@ -1253,6 +1258,7 @@
"//apex_available:platform",
"//apex_available:anyapex",
],
+ min_sdk_version: "24",
}
java_library_static {
@@ -1279,6 +1285,7 @@
"//apex_available:platform",
"//apex_available:anyapex",
],
+ min_sdk_version: "24",
}
java_library_static {
@@ -2268,6 +2275,7 @@
"//apex_available:platform",
"//apex_available:anyapex",
],
+ min_sdk_version: "24",
}
java_library_static {
@@ -2293,6 +2301,7 @@
"//apex_available:platform",
"//apex_available:anyapex",
],
+ min_sdk_version: "24",
}
java_library_static {
@@ -2650,6 +2659,7 @@
"//apex_available:platform",
"//apex_available:anyapex",
],
+ min_sdk_version: "24",
}
java_library_static {
@@ -2702,6 +2712,7 @@
"//apex_available:platform",
"//apex_available:anyapex",
],
+ min_sdk_version: "24",
}
java_library_static {
diff --git a/update_prebuilts/update_prebuilts.py b/update_prebuilts/update_prebuilts.py
index c71ffa1..b7422a3 100755
--- a/update_prebuilts/update_prebuilts.py
+++ b/update_prebuilts/update_prebuilts.py
@@ -313,7 +313,9 @@
# generate a single Android.bp that specifies to use all of the above artifacts
makefile = os.path.join(working_dir, 'Android.bp')
with open(makefile, 'w') as f:
- args = ["pom2bp", "-sdk-version", "current"]
+ args = ["pom2bp"]
+ args.extend(["-sdk-version", "current"])
+ args.extend(["-default-min-sdk-version", "24"])
if include_static_deps:
args.append("-static-deps")
rewriteNames = sorted([name for name in maven_to_make if ":" in name] + [name for name in maven_to_make if ":" not in name])