Add min_sdk_version:R to updatable apexes
APEXes introduced in R need to set min_sdk_version to ensure that they
are built against correct version(30 or R) of stubs (libc/liblog/...).
Bug: 152655956
Test: /vendor/google/build/build_mainline_modules.sh
Change-Id: I4a893c34b09334eea124266287301e479b9e8a59
diff --git a/apex/extservices/Android.bp b/apex/extservices/Android.bp
index 021246c..68350af 100644
--- a/apex/extservices/Android.bp
+++ b/apex/extservices/Android.bp
@@ -21,6 +21,7 @@
apex_defaults {
name: "com.android.extservices-defaults",
updatable: true,
+ min_sdk_version: "R",
key: "com.android.extservices.key",
certificate: ":com.android.extservices.certificate",
apps: ["ExtServices"],
diff --git a/apex/permission/Android.bp b/apex/permission/Android.bp
index 0171b0d..71a52bb 100644
--- a/apex/permission/Android.bp
+++ b/apex/permission/Android.bp
@@ -21,6 +21,7 @@
apex_defaults {
name: "com.android.permission-defaults",
updatable: true,
+ min_sdk_version: "R",
key: "com.android.permission.key",
certificate: ":com.android.permission.certificate",
java_libs: [
diff --git a/apex/sdkextensions/Android.bp b/apex/sdkextensions/Android.bp
index 322d5e1..fc26e08 100644
--- a/apex/sdkextensions/Android.bp
+++ b/apex/sdkextensions/Android.bp
@@ -27,6 +27,7 @@
apex_defaults {
name: "com.android.sdkext-defaults",
updatable: true,
+ min_sdk_version: "R",
java_libs: [ "framework-sdkextensions" ],
prebuilts: [
"derive_sdk.rc",
diff --git a/apex/statsd/Android.bp b/apex/statsd/Android.bp
index 2df3eea..32e13e3 100644
--- a/apex/statsd/Android.bp
+++ b/apex/statsd/Android.bp
@@ -33,6 +33,7 @@
prebuilts: ["com.android.os.statsd.init.rc"],
name: "com.android.os.statsd-defaults",
updatable: true,
+ min_sdk_version: "R",
key: "com.android.os.statsd.key",
certificate: ":com.android.os.statsd.certificate",
}
diff --git a/packages/Tethering/apex/Android.bp b/packages/Tethering/apex/Android.bp
index 96a4d20..24df5f6 100644
--- a/packages/Tethering/apex/Android.bp
+++ b/packages/Tethering/apex/Android.bp
@@ -17,6 +17,7 @@
apex {
name: "com.android.tethering",
updatable: true,
+ min_sdk_version: "R",
java_libs: ["framework-tethering"],
apps: ["Tethering"],
manifest: "manifest.json",