Update the .bp file and annotations of ART services.
- Change the SDK version to system_server_current.
- Change the annotation to @SystemApi(client = SYSTEM_SERVER).
Bug: 177273468
Test: (on aosp-master-art) banchan com.android.art x86_64 && m
Ignore-AOSP-first: Merge Conflicts
Change-Id: Ia6e72118689f84e49fcd6d8d0ae39569ca6f590b
diff --git a/libartservice/Android.bp b/libartservice/Android.bp
index 985a2eb..b9632ea 100644
--- a/libartservice/Android.bp
+++ b/libartservice/Android.bp
@@ -68,27 +68,9 @@
"com.android.art",
"com.android.art.debug",
],
- sdk_version: "core_platform",
+ sdk_version: "system_server_current",
min_sdk_version: "31",
- public: {
- // Override the setting of "module_current" from the defaults as that is
- // not available in all manifests where this needs to be built.
- sdk_version: "core_current",
- },
-
- system_server: {
- // Override the setting of "module_current" from the defaults as that is
- // not available in all manifests where this needs to be built.
- sdk_version: "core_current",
- },
-
- // The API elements are the ones annotated with
- // libcore.api.CorePlatformApi(status=libcore.api.CorePlatformApi.Status.STABLE)
- droiddoc_options: [
- "--show-single-annotation libcore.api.CorePlatformApi\\(status=libcore.api.CorePlatformApi.Status.STABLE\\)",
- ],
-
// Temporarily disable compatibility with previous released APIs.
// TODO - remove once prototype has stabilized
// running "m update-api" will give instructions on what to do next
@@ -100,11 +82,10 @@
compile_dex: true,
srcs: [
- "service/java/com/android/server/art/ArtManagerLocal.java",
+ "service/java/**/*.java",
],
libs: [
- "art.module.api.annotations.for.system.modules",
],
plugins: ["java_api_finder"],
diff --git a/libartservice/api/current.txt b/libartservice/api/current.txt
index c7844e0..d802177 100644
--- a/libartservice/api/current.txt
+++ b/libartservice/api/current.txt
@@ -1,9 +1 @@
// Signature format: 2.0
-package com.android.server.art {
-
- public final class ArtManagerLocal {
- ctor public ArtManagerLocal();
- }
-
-}
-
diff --git a/libartservice/service/java/com/android/server/art/ArtManagerLocal.java b/libartservice/service/java/com/android/server/art/ArtManagerLocal.java
index aac4b25..64aec7b 100644
--- a/libartservice/service/java/com/android/server/art/ArtManagerLocal.java
+++ b/libartservice/service/java/com/android/server/art/ArtManagerLocal.java
@@ -16,15 +16,16 @@
package com.android.server.art;
-import libcore.api.CorePlatformApi;
+import android.annotation.SystemApi;
/**
- * This class provides a system API for functionality provided by the ART
- * module.
+ * This class provides a system API for functionality provided by the ART module.
+ *
+ * @hide
*/
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
+@SystemApi(client = SystemApi.Client.SYSTEM_SERVER)
public final class ArtManagerLocal {
- static final String LOG_TAG = "ArtService";
+ private static final String TAG = "ArtService";
public ArtManagerLocal() {}
}