Merge "Revert "Give pom2bp -default-min-sdk-version 24 param"" am: 24368f8d45 am: f45709f37a am: 757e2c7fd6
Original change: https://android-review.googlesource.com/c/platform/prebuilts/sdk/+/1665859
Change-Id: Ide31d87485b1f0efbf4a7b5737aafb0a27cf9e4b
diff --git a/current/androidx/Android.bp b/current/androidx/Android.bp
index e62c73b..4420a71 100644
--- a/current/androidx/Android.bp
+++ b/current/androidx/Android.bp
@@ -136,7 +136,6 @@
"//apex_available:platform",
"//apex_available:anyapex",
],
- min_sdk_version: "24",
}
java_library_static {
@@ -372,7 +371,6 @@
"//apex_available:platform",
"//apex_available:anyapex",
],
- min_sdk_version: "24",
}
java_library_static {
@@ -686,7 +684,6 @@
"//apex_available:platform",
"//apex_available:anyapex",
],
- min_sdk_version: "24",
}
java_library_static {
@@ -713,7 +710,6 @@
"//apex_available:platform",
"//apex_available:anyapex",
],
- min_sdk_version: "24",
}
java_library_static {
@@ -739,7 +735,6 @@
"//apex_available:platform",
"//apex_available:anyapex",
],
- min_sdk_version: "24",
}
java_library_static {
@@ -1500,7 +1495,6 @@
"//apex_available:platform",
"//apex_available:anyapex",
],
- min_sdk_version: "24",
}
java_library_static {
@@ -1527,7 +1521,6 @@
"//apex_available:platform",
"//apex_available:anyapex",
],
- min_sdk_version: "24",
}
java_library_static {
@@ -2529,7 +2522,6 @@
"//apex_available:platform",
"//apex_available:anyapex",
],
- min_sdk_version: "24",
}
java_library_static {
@@ -2555,7 +2547,6 @@
"//apex_available:platform",
"//apex_available:anyapex",
],
- min_sdk_version: "24",
}
java_library_static {
@@ -2915,7 +2906,6 @@
"//apex_available:platform",
"//apex_available:anyapex",
],
- min_sdk_version: "24",
}
java_library_static {
@@ -2994,7 +2984,6 @@
"//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 16d3b95..8a98949 100755
--- a/update_prebuilts/update_prebuilts.py
+++ b/update_prebuilts/update_prebuilts.py
@@ -325,9 +325,7 @@
# 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"]
- args.extend(["-sdk-version", "current"])
- args.extend(["-default-min-sdk-version", "24"])
+ args = ["pom2bp", "-sdk-version", "current"]
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])