Merge "Move ravenwood annotations to module-utils (1/2)" into main (6269058b) · Commits · e / os / android_frameworks_base

Android.bp

+0 −2

Original line number	Diff line number	Diff line
		@@ -64,7 +64,6 @@ filegroup {
		srcs: [
		// Java/AIDL sources under frameworks/base
		":framework-annotations",
		":ravenwood-annotations",
		":framework-blobstore-sources",
		":framework-core-sources",
		":framework-drm-sources",
		@@ -294,7 +293,6 @@ java_defaults {
		enforce_permissions_exceptions: [
		// Do not add entries to this list.
		":framework-annotations",
		":ravenwood-annotations",
		":framework-blobstore-sources",
		":framework-core-sources",
		":framework-drm-sources",

ravenwood/Android.bp

+0 −17

Original line number	Diff line number	Diff line
		@@ -11,15 +11,6 @@ package {
		default_team: "trendy_team_framework_backstage_power",
		}

		filegroup {
		name: "ravenwood-annotations",
		srcs: [
		"annotations-src/*/.java",
		],
		path: "annotations-src",
		visibility: ["//visibility:public"],
		}

		filegroup {
		name: "ravenwood-services-policies",
		srcs: [
		@@ -52,14 +43,6 @@ filegroup {
		visibility: ["//visibility:public"],
		}

		java_library {
		name: "ravenwood-annotations-lib",
		srcs: [":ravenwood-annotations"],
		sdk_version: "core_current",
		host_supported: true,
		visibility: ["//visibility:public"],
		}

		// This and the next module contain the same classes with different implementations.
		// "ravenwood-runtime-common-device" will be statically linked in device side tests.
		// "ravenwood-runtime-common-ravenwood" will only exist in ravenwood-runtime, which will take

ravenwood/annotations-src/android/ravenwood/annotation/RavenwoodClassLoadHook.java

deleted100644 → 0

+0 −48

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2023 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 android.ravenwood.annotation;

		import static java.lang.annotation.ElementType.TYPE;

		import java.lang.annotation.Retention;
		import java.lang.annotation.RetentionPolicy;
		import java.lang.annotation.Target;

		/**
		* THIS ANNOTATION IS EXPERIMENTAL. REACH OUT TO g/ravenwood BEFORE USING IT, OR YOU HAVE ANY
		* QUESTIONS ABOUT IT.
		*
		* Add this with a fully-specified method name (e.g. {@code "com.package.Class.methodName"})
		* of a callback to get a callback at the class load time.
		*
		* The method must be {@code public static} with a single argument that takes {@link Class}.
		*
		* Typically, this is used with {@link #LIBANDROID_LOADING_HOOK}, which will load the necessary
		* native libraries.
		*
		* @hide
		*/
		@Target({TYPE})
		@Retention(RetentionPolicy.CLASS)
		public @interface RavenwoodClassLoadHook {
		String value();

		/**
		* Class load hook that loads <code>libandroid_runtime</code>.
		*/
		public static String LIBANDROID_LOADING_HOOK
		= "com.android.platform.test.ravenwood.runtimehelper.ClassLoadHook.onClassLoaded";
		}

ravenwood/annotations-src/android/ravenwood/annotation/RavenwoodKeep.java

deleted100644 → 0

+0 −37

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2023 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 android.ravenwood.annotation;

		import static java.lang.annotation.ElementType.CONSTRUCTOR;
		import static java.lang.annotation.ElementType.FIELD;
		import static java.lang.annotation.ElementType.METHOD;

		import java.lang.annotation.Retention;
		import java.lang.annotation.RetentionPolicy;
		import java.lang.annotation.Target;

		/**
		* THIS ANNOTATION IS EXPERIMENTAL. REACH OUT TO g/ravenwood BEFORE USING IT, OR YOU HAVE ANY
		* QUESTIONS ABOUT IT.
		*
		* TODO: Javadoc
		*
		* @hide
		*/
		@Target({FIELD, METHOD, CONSTRUCTOR})
		@Retention(RetentionPolicy.CLASS)
		public @interface RavenwoodKeep {
		}

ravenwood/annotations-src/android/ravenwood/annotation/RavenwoodKeepPartialClass.java

deleted100644 → 0

+0 −34

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2023 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 android.ravenwood.annotation;

		import java.lang.annotation.ElementType;
		import java.lang.annotation.Retention;
		import java.lang.annotation.RetentionPolicy;
		import java.lang.annotation.Target;

		/**
		* THIS ANNOTATION IS EXPERIMENTAL. REACH OUT TO g/ravenwood BEFORE USING IT, OR YOU HAVE ANY
		* QUESTIONS ABOUT IT.
		*
		* TODO: Javadoc
		*
		* @hide
		*/
		@Target(ElementType.TYPE)
		@Retention(RetentionPolicy.CLASS)
		public @interface RavenwoodKeepPartialClass {
		}