Using common apex_defaults for com.android.art module.
In /packages/modules/common/sdk/ModuleDefaults.bp file, some
apex_defaults are added to provide common parameters corresponding to
Q, R, S, and T releases.
(Refer to CL link for above mentioned change -
https://android-review.googlesource.com/c/platform/packages/modules/common/+/2005890?forceReload=true)
This CL is using the apex_default corresponding to R release for the
com.google.android.art module.
Bug: 172589606
Test: USE_RBE=true m
Since there are no runtime changes, successful code build is enough for
testing.
Change-Id: Iad596472d8f5dc2b92bc2a3cea597480224c0523
diff --git a/build/apex/Android.bp b/build/apex/Android.bp
index 8d3b7ac..fb071f1 100644
--- a/build/apex/Android.bp
+++ b/build/apex/Android.bp
@@ -254,7 +254,10 @@
// Default values shared by device ART APEXes.
apex_defaults {
name: "com.android.art-device-defaults-minus-odrefresh",
- defaults: ["com.android.art-defaults"],
+ defaults: [
+ "com.android.art-defaults",
+ "s-launched-apex-module",
+ ],
compile_multilib: "both",
manifest: "manifest-art.json",
bootclasspath_fragments: ["art-bootclasspath-fragment"],
@@ -295,7 +298,6 @@
enabled: false,
},
},
- 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,
@@ -336,7 +338,12 @@
// `libart-broken` instead of `libart`.
apex_test {
name: "test_broken_com.android.art",
- defaults: ["com.android.art-defaults"],
+ // Use of "s-launched-apex-module" does not imply that this is a released
+ // module.
+ defaults: [
+ "com.android.art-defaults",
+ "s-launched-apex-module",
+ ],
// Only include native libraries in this test APEX. Don't include
// binaries (and maybe other artifacts) for now, as they pull
@@ -351,7 +358,6 @@
file_contexts: ":com.android.art-file_contexts",
certificate: ":com.android.art.certificate",
installable: false,
- min_sdk_version: "31",
}
apex_test {
@@ -367,7 +373,6 @@
file_contexts: ":com.android.art-file_contexts",
certificate: ":com.android.art.certificate",
installable: false,
- min_sdk_version: "31",
}
// Release version of the ART APEX module (not containing debug