Minor build tweaks
Remove unsafe_ignore_missing_latest_api: true, and instead add
prebuilt_apis with empty baseline api/*.txt files.
Remove platform_apis: true in various places where it does nothing
and/or is unnecessary.
Bug: 242828259
Test: atest MicrodroidHostTestCases
Change-Id: I3e4377a17a106e5ce03e9f39a716ef2c9b8b993e
diff --git a/compos/service/Android.bp b/compos/service/Android.bp
index 336ae9b..3dcf8be 100644
--- a/compos/service/Android.bp
+++ b/compos/service/Android.bp
@@ -36,6 +36,5 @@
// Access to SystemService, ServiceManager#waitForService etc
libs: ["services"],
sdk_version: "",
- platform_apis: true,
installable: true,
}
diff --git a/javalib/32/public/api/android.system.virtualmachine-removed.txt b/javalib/32/public/api/android.system.virtualmachine-removed.txt
new file mode 100644
index 0000000..d802177
--- /dev/null
+++ b/javalib/32/public/api/android.system.virtualmachine-removed.txt
@@ -0,0 +1 @@
+// Signature format: 2.0
diff --git a/javalib/32/public/api/android.system.virtualmachine.txt b/javalib/32/public/api/android.system.virtualmachine.txt
new file mode 100644
index 0000000..d802177
--- /dev/null
+++ b/javalib/32/public/api/android.system.virtualmachine.txt
@@ -0,0 +1 @@
+// Signature format: 2.0
diff --git a/javalib/32/system/api/android.system.virtualmachine-removed.txt b/javalib/32/system/api/android.system.virtualmachine-removed.txt
new file mode 100644
index 0000000..d802177
--- /dev/null
+++ b/javalib/32/system/api/android.system.virtualmachine-removed.txt
@@ -0,0 +1 @@
+// Signature format: 2.0
diff --git a/javalib/32/system/api/android.system.virtualmachine.txt b/javalib/32/system/api/android.system.virtualmachine.txt
new file mode 100644
index 0000000..d802177
--- /dev/null
+++ b/javalib/32/system/api/android.system.virtualmachine.txt
@@ -0,0 +1 @@
+// Signature format: 2.0
diff --git a/javalib/Android.bp b/javalib/Android.bp
index 26ad848..1df9b51 100644
--- a/javalib/Android.bp
+++ b/javalib/Android.bp
@@ -17,8 +17,11 @@
"android.system.virtualmachine",
"android.system.virtualizationservice",
],
- // TODO(jiyong): remove the below once this gets public
- unsafe_ignore_missing_latest_api: true,
+}
+
+prebuilt_apis {
+ name: "android-virtualization-framework-sdk",
+ api_dirs: ["32"],
}
android_app {
diff --git a/tests/aidl/Android.bp b/tests/aidl/Android.bp
index 893ec0b..d59ca7e 100644
--- a/tests/aidl/Android.bp
+++ b/tests/aidl/Android.bp
@@ -8,7 +8,6 @@
unstable: true,
backend: {
java: {
- platform_apis: true,
gen_rpc: true,
},
cpp: {
diff --git a/tests/helper/Android.bp b/tests/helper/Android.bp
index e7760e2..200eb42 100644
--- a/tests/helper/Android.bp
+++ b/tests/helper/Android.bp
@@ -18,5 +18,4 @@
"truth-prebuilt",
],
libs: ["android.system.virtualmachine"],
- platform_apis: true,
}