RESTRICT AUTOMERGE: Revert "Initial layout of ART Service files"
This reverts commit befdad488b42600826b4a3bd7c92f19a0104d7fa.
Test: m
Bug: 184281926
Change-Id: Ic131fea9237c69eaa6b64005612b7f65c1b0fdff
diff --git a/build/apex/Android.bp b/build/apex/Android.bp
index 9deb1e8..769177e 100644
--- a/build/apex/Android.bp
+++ b/build/apex/Android.bp
@@ -62,16 +62,12 @@
// dependencies work with APEX libraries.
"libart",
"libart-compiler",
- "libartservice",
"libdt_fd_forward",
"libdt_socket",
"libjdwp",
"libnpt",
"libopenjdkjvm",
"libopenjdkjvmti",
- // TODO(chriswailes): Make libarttools a dependency for another target
- // when such a target exists
- "libarttools",
]
art_runtime_base_native_device_only_shared_libs = [
@@ -243,7 +239,6 @@
compile_multilib: "both",
manifest: "manifest-art.json",
bootclasspath_fragments: ["art-bootclasspath-fragment"],
- systemserverclasspath_fragments: ["art-systemserverclasspath-fragment"],
compat_configs: ["libcore-platform-compat-config"],
java_libs: libcore_java_libs,
native_shared_libs: art_runtime_base_native_shared_libs +
diff --git a/build/apex/art_apex_test.py b/build/apex/art_apex_test.py
index 591457e..1332945 100755
--- a/build/apex/art_apex_test.py
+++ b/build/apex/art_apex_test.py
@@ -540,8 +540,6 @@
self._checker.check_native_library('libart-disassembler')
self._checker.check_native_library('libartbase')
self._checker.check_native_library('libartpalette')
- self._checker.check_native_library('libartservice')
- self._checker.check_native_library('libarttools')
self._checker.check_native_library('libdexfile_support')
self._checker.check_native_library('libdt_fd_forward')
self._checker.check_native_library('libopenjdkjvm')
@@ -549,9 +547,6 @@
self._checker.check_native_library('libprofile')
self._checker.check_native_library('libsigchain')
- # Check internal Java libraries
- self._checker.check_java_library("service-art")
-
# Check java libraries for Managed Core Library.
self._checker.check_java_library('apache-xml')
self._checker.check_java_library('bouncycastle')
diff --git a/build/boot/Android.bp b/build/boot/Android.bp
index 64c172b..d549d84 100644
--- a/build/boot/Android.bp
+++ b/build/boot/Android.bp
@@ -76,13 +76,3 @@
unsupported_packages: ["hiddenapi/hiddenapi-unsupported-packages.txt"],
},
}
-
-// Encapsulate the contributions made by the com.android.art to the systemserverclasspath.
-systemserverclasspath_fragment {
- name: "art-systemserverclasspath-fragment",
- contents: ["service-art"],
- apex_available: [
- "com.android.art",
- "com.android.art.debug",
- ],
-}
diff --git a/libartservice/Android.bp b/libartservice/Android.bp
deleted file mode 100644
index 90df77b..0000000
--- a/libartservice/Android.bp
+++ /dev/null
@@ -1,151 +0,0 @@
-// Copyright (C) 2021 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package {
- // See: http://go/android-license-faq
- // A large-scale-change added 'default_applicable_licenses' to import
- // all of the 'license_kinds' from "art_license"
- // to get the below license kinds:
- // SPDX-license-identifier-Apache-2.0
- default_applicable_licenses: ["art_license"],
-}
-
-cc_library {
- // This native library contains JNI support code for the ART Service Java
- // Language library.
-
- name: "libartservice",
- defaults: ["art_defaults"],
- host_supported: true,
- srcs: [
- "service/native/service.cc",
- ],
- export_include_dirs: ["."],
- apex_available: [
- "com.android.art",
- "com.android.art.debug",
- ],
- shared_libs: [
- "libbase",
- ],
- export_shared_lib_headers: ["libbase"],
-}
-
-// This variable definition and many of the settings involved in the
-// service-art target are taken from the
-// framework-system-server-module-defaults target and its dependencies. These
-// target are not used directly because they have a dependency on a
-// frameworks/base library which is not available in the unbundled ART build
-// servers (framework-annotations-lib).
-//
-// TODO (b/183133670): Remove this hack and use the
-// framework-system-server-module-defaults target
-mainline_stubs_args = "--error UnhiddenSystemApi " +
- "--hide BroadcastBehavior " +
- "--hide CallbackInterface " +
- "--hide DeprecationMismatch " +
- "--hide HiddenSuperclass " +
- "--hide HiddenTypedefConstant " +
- "--hide HiddenTypeParameter " +
- "--hide MissingPermission " +
- "--hide RequiresPermission " +
- "--hide SdkConstant " +
- "--hide Todo " +
- "--hide Typo " +
- "--hide UnavailableSymbol "
-
-// Provides the API and implementation of the ART Service class that will be
-// loaded by the System Server.
-java_sdk_library {
- // This target is named 'service-art' to conform to the naming conventions
- // for JAR files in the System Server.
- name: "service-art",
- permitted_packages: ["com.android.server.art"],
-
- system_server: {
- enabled: true,
- sdk_version: "module_current",
- },
-
- // Prevent dependencies that do not specify an sdk_version from accessing the
- // implementation library by default and force them to use stubs instead.
- default_to_stubs: true,
-
- api_lint: {
- enabled: true,
- },
-
- annotations_enabled: true,
-
- // installable implies we'll create a non-apex (platform) variant, which
- // we shouldn't ordinarily need (and it can create issues), so disable that.
- installable: false,
-
- visibility: [
- "//art:__subpackages__",
- "//frameworks/base/services/core",
- "//frameworks/base/apex:__subpackages__",
- "//packages/modules:__subpackages__",
- ],
-
- impl_library_visibility: [
- ":__pkg__",
- "//art/libartservice/tests",
- "//frameworks/base",
- ],
-
- stubs_library_visibility: ["//visibility:public"],
- stubs_source_visibility: ["//visibility:private"],
-
- apex_available: [
- "com.android.art",
- "com.android.art.debug",
- ],
- sdk_version: "core_platform",
- min_sdk_version: "31",
-
- // This is not actually part of the public API but this is the only
- // way to define a custom API surface.
- public: {
- enabled: true,
- sdk_version: "module_current",
- },
-
- // The API elements are the ones annotated with
- // libcore.api.CorePlatformApi(status=libcore.api.CorePlatformApi.Status.STABLE)
- droiddoc_options: [
- mainline_stubs_args,
- "--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
- unsafe_ignore_missing_latest_api: true,
-
- // This cannot be accessed by apps using <uses-library> in their manifest.
- shared_library: false,
- // TODO(b/188773212): force dex compilation for inclusion in bootclasspath_fragment.
- compile_dex: true,
-
- srcs: [
- "service/java/com/android/server/art/ArtManagerLocal.java",
- ],
-
- libs: [
- "art.module.api.annotations.for.system.modules",
- ],
-
- plugins: ["java_api_finder"],
-}
diff --git a/libartservice/service/java/com/android/server/art/ArtManagerLocal.java b/libartservice/service/java/com/android/server/art/ArtManagerLocal.java
deleted file mode 100644
index 04629cb..0000000
--- a/libartservice/service/java/com/android/server/art/ArtManagerLocal.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.server.art;
-
-/**
- * This class provides a system API for functionality provided by the ART
- * module.
- */
-@libcore.api.CorePlatformApi(status = libcore.api.CorePlatformApi.Status.STABLE)
-public final class ArtManagerLocal {
- static final String LOG_TAG = "ArtService";
-
- public ArtManagerLocal() {}
-}
diff --git a/libartservice/service/native/service.cc b/libartservice/service/native/service.cc
deleted file mode 100644
index d33cb59..0000000
--- a/libartservice/service/native/service.cc
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "service.h"
-
-namespace art {
-namespace service {
-
-std::string getMsg() {
- return "hello world!";
-}
-
-}
-}
diff --git a/libartservice/service/native/service.h b/libartservice/service/native/service.h
deleted file mode 100644
index 2b680a2..0000000
--- a/libartservice/service/native/service.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef ART_LIBARTSERVICE_SERVICE_NATIVE_SERVICE_H_
-#define ART_LIBARTSERVICE_SERVICE_NATIVE_SERVICE_H_
-
-#include <string>
-
-namespace art {
-namespace service {
-
-std::string getMsg();
-
-} // namespace service
-} // namespace art
-
-#endif // ART_LIBARTSERVICE_SERVICE_NATIVE_SERVICE_H_
diff --git a/libarttools/Android.bp b/libarttools/Android.bp
deleted file mode 100644
index a042d69..0000000
--- a/libarttools/Android.bp
+++ /dev/null
@@ -1,47 +0,0 @@
-//
-// Copyright (C) 2021 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-package {
- // See: http://go/android-license-faq
- // A large-scale-change added 'default_applicable_licenses' to import
- // all of the 'license_kinds' from "art_license"
- // to get the below license kinds:
- // SPDX-license-identifier-Apache-2.0
- default_applicable_licenses: ["art_license"],
-}
-
-cc_library {
- // This library contains low-level interfaces used to call dex2oat and
- // related tools. It will translate structured messages into command line
- // arguments. This will allow other libraries or programs besides the ART
- // Service to make use of this functionality.
-
- name: "libarttools",
- defaults: ["art_defaults"],
- host_supported: true,
- srcs: [
- "tools/tools.cc",
- ],
- export_include_dirs: ["."],
- apex_available: [
- "com.android.art",
- "com.android.art.debug",
- ],
- shared_libs: [
- "libbase",
- ],
- export_shared_lib_headers: ["libbase"],
-}
diff --git a/libarttools/tools/tools.cc b/libarttools/tools/tools.cc
deleted file mode 100644
index a3a91e8..0000000
--- a/libarttools/tools/tools.cc
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "tools.h"
-
-namespace art {
-namespace tools {
-
-std::string getMsg() {
- return "hello world!";
-}
-
-}
-}
diff --git a/libarttools/tools/tools.h b/libarttools/tools/tools.h
deleted file mode 100644
index 8231f5f..0000000
--- a/libarttools/tools/tools.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef ART_LIBARTTOOLS_TOOLS_TOOLS_H_
-#define ART_LIBARTTOOLS_TOOLS_TOOLS_H_
-
-#include <string>
-
-namespace art {
-namespace tools {
-
-std::string getMsg();
-
-} // namespace tools
-} // namespace art
-
-#endif // ART_LIBARTTOOLS_TOOLS_TOOLS_H_