Consolidate min_sdk_version settings.
31 is now the official API version.
Test: m nothing
Bug: 204364566
Change-Id: I93464af50e85cd59a8ba25b987520744e75ec0b3
diff --git a/artd/Android.bp b/artd/Android.bp
index e57d22c..1a90c4c 100644
--- a/artd/Android.bp
+++ b/artd/Android.bp
@@ -25,7 +25,6 @@
art_cc_binary {
name: "artd",
defaults: ["art_defaults"],
- min_sdk_version: "S",
srcs: [
"artd.cc",
diff --git a/artd/binder/Android.bp b/artd/binder/Android.bp
index 17678af..260340b 100644
--- a/artd/binder/Android.bp
+++ b/artd/binder/Android.bp
@@ -42,8 +42,7 @@
"com.android.art.debug",
"com.android.compos",
],
- // TODO(b/177273468): Increment to next version when possible
- min_sdk_version: "S",
+ min_sdk_version: "31",
},
},
unstable: true,
@@ -67,8 +66,7 @@
"com.android.art",
"com.android.art.debug",
],
- // TODO(b/177273468): Increment to next version when possible
- min_sdk_version: "S",
+ min_sdk_version: "31",
},
},
unstable: true,
diff --git a/build/Android.bp b/build/Android.bp
index 4d83fcc..7055ad9 100644
--- a/build/Android.bp
+++ b/build/Android.bp
@@ -259,7 +259,7 @@
"-extra-arg=-Wno-unreachable-code",
],
- min_sdk_version: "S",
+ min_sdk_version: "31",
}
// Used to generate binaries that can be backed by transparent hugepages.
diff --git a/build/apex/Android.bp b/build/apex/Android.bp
index de18cdd..c2e08d5 100644
--- a/build/apex/Android.bp
+++ b/build/apex/Android.bp
@@ -296,7 +296,7 @@
enabled: false,
},
},
- min_sdk_version: "S",
+ min_sdk_version: "31",
// Indicates that pre-installed version of this apex can be compressed.
// Whether it actually will be compressed is controlled on per-device basis.
compressible: true,
diff --git a/libdexfile/Android.bp b/libdexfile/Android.bp
index 3767696..34fbb14 100644
--- a/libdexfile/Android.bp
+++ b/libdexfile/Android.bp
@@ -388,6 +388,7 @@
// static libraries (b/169779783).
art_cc_library_static {
name: "libdexfile_support",
+ defaults: ["art_defaults"],
visibility: ["//visibility:public"],
host_supported: true,
srcs: [
@@ -409,7 +410,6 @@
"com.android.media.swcodec",
"com.android.runtime",
],
- min_sdk_version: "S",
}
art_cc_defaults {
diff --git a/odrefresh/Android.bp b/odrefresh/Android.bp
index 5426e37..64859e3 100644
--- a/odrefresh/Android.bp
+++ b/odrefresh/Android.bp
@@ -74,11 +74,11 @@
cc_library_headers {
name: "odrefresh_headers",
+ defaults: ["art_defaults"],
export_include_dirs: ["include"],
host_supported: true,
stl: "none",
system_shared_libs: [],
- min_sdk_version: "29", // As part of mainline modules(APEX), it should support at least 29(Q).
sdk_version: "minimum", // The minimum sdk version required by users of this module.
apex_available: [
"//apex_available:platform", // For odsign.
diff --git a/test/Android.bp b/test/Android.bp
index c90b336..8cddfb6 100644
--- a/test/Android.bp
+++ b/test/Android.bp
@@ -491,7 +491,7 @@
host_required: [
"art-run-test-checker",
],
- min_sdk_version: "S",
+ min_sdk_version: "31",
}
art_cc_test_library {