Cleanup Android.bp:framework-virtualization
There are a bunch of variables that are already set in the
framework-module-defaults, so there is no need to duplicate them.
Also disable the JavaApiUsedByMainlineModule check, since we are not an
updatable module we don't need it, and it's quite spammy.
As a side effect of this change our tests & demo apks need to compile
against framework-virtualization.impl library (which includes the hidden
APIs). Once the APIs are promoted to @SystemApi we can change the tests
to compile against framework-virtualization (which contains the API
stubs).
Bug: 243512044
Test: presubmit
Change-Id: Ib614d266f7a9cb8517afccd4feb737068b51fb20
diff --git a/demo/Android.bp b/demo/Android.bp
index 5241e25..2b234a6 100644
--- a/demo/Android.bp
+++ b/demo/Android.bp
@@ -13,7 +13,10 @@
"com.google.android.material_material",
],
libs: [
- "framework-virtualization",
+ // We need to compile against the .impl library which includes the hidden
+ // APIs. Once the APIs are promoted to @SystemApi we can switch to
+ // framework-virtualization, which contains API stubs.
+ "framework-virtualization.impl",
],
jni_libs: ["MicrodroidTestNativeLib"],
platform_apis: true,
diff --git a/javalib/Android.bp b/javalib/Android.bp
index 04ed273..9be0e9d 100644
--- a/javalib/Android.bp
+++ b/javalib/Android.bp
@@ -12,19 +12,10 @@
java_sdk_library {
name: "framework-virtualization",
- installable: false,
- compile_dex: true,
// TODO(b/243512044): introduce non-updatable-framework-module-defaults
-
defaults: ["framework-module-defaults"],
- shared_library: false,
-
- default_to_stubs: false,
-
- dist_group: "android",
-
jarjar_rules: "jarjar-rules.txt",
srcs: ["src/**/*.java"],
@@ -43,43 +34,30 @@
"com.android.system.virtualmachine.sysprop",
],
errorprone: {
- // We use @GuardedBy and we want a test failure if our locking isn't consistent with it.
enabled: true,
javacflags: [
+ // We use @GuardedBy and we want a test failure if our locking isn't consistent with it.
"-Xep:GuardedBy:ERROR",
+ // JavaApiUsedByMainlineModule is quite spammy, and since we com.android.virt is not
+ // an updatable module we don't need it.
+ "-Xep:JavaApiUsedByMainlineModule:OFF",
],
},
- public: {
- enabled: true,
- sdk_version: "module_current",
- },
-
- system: {
- enabled: true,
- sdk_version: "module_current",
- },
-
- module_lib: {
- enabled: true,
- sdk_version: "module_current",
- },
-
test: {
enabled: true,
sdk_version: "module_current",
},
sdk_version: "core_platform",
- platform_apis: true,
impl_only_libs: [
"framework",
],
impl_library_visibility: [
- "//frameworks/base",
+ "//packages/modules/Virtualization:__subpackages__",
],
- // Temporary workaround, will be removed in a follow-up child cl.
+ // TODO(b/243512044): remove once we have API tracking files in prebuilts/sdk
unsafe_ignore_missing_latest_api: true,
}
diff --git a/tests/benchmark/Android.bp b/tests/benchmark/Android.bp
index bccea6b..1747183 100644
--- a/tests/benchmark/Android.bp
+++ b/tests/benchmark/Android.bp
@@ -16,7 +16,10 @@
"com.android.microdroid.testservice-java",
"truth-prebuilt",
],
- libs: ["framework-virtualization"],
+ // We need to compile against the .impl library which includes the hidden
+ // APIs. Once the APIs are promoted to @SystemApi we can switch to
+ // framework-virtualization, which contains API stubs.
+ libs: ["framework-virtualization.impl"],
jni_libs: [
"MicrodroidBenchmarkNativeLib",
"MicrodroidIdleNativeLib",
diff --git a/tests/helper/Android.bp b/tests/helper/Android.bp
index bd92020..86af955 100644
--- a/tests/helper/Android.bp
+++ b/tests/helper/Android.bp
@@ -24,5 +24,8 @@
"VirtualizationTestHelper",
"truth-prebuilt",
],
- libs: ["framework-virtualization"],
+ // We need to compile against the .impl library which includes the hidden
+ // APIs. Once the APIs are promoted to @SystemApi we can switch to
+ // framework-virtualization, which contains API stubs.
+ libs: ["framework-virtualization.impl"],
}
diff --git a/tests/testapk/Android.bp b/tests/testapk/Android.bp
index 8d49721..707dca1 100644
--- a/tests/testapk/Android.bp
+++ b/tests/testapk/Android.bp
@@ -19,7 +19,10 @@
"truth-prebuilt",
"compatibility-common-util-devicesidelib",
],
- libs: ["framework-virtualization"],
+ // We need to compile against the .impl library which includes the hidden
+ // APIs. Once the APIs are promoted to @SystemApi we can switch to
+ // framework-virtualization, which contains API stubs.
+ libs: ["framework-virtualization.impl"],
jni_libs: [
"MicrodroidTestNativeLib",
"MicrodroidIdleNativeLib",