Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 91b2223d authored Sep 28, 2022 by Sorin Basca Committed by Automerger Merge Worker Sep 28, 2022

Merge "Unpin staledataclass-annotation-processor from Java 8" am: 818cc232...

Merge "Unpin staledataclass-annotation-processor from Java 8" am: 818cc232 am: 7ef2a666 am: 78f8f9af am: 8b6aaf90

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2234390

Change-Id: I2cf1ccd7ebde155698328eaa46f92cd71dc89361
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 1e27923b 8b6aaf90

Android.bp

+8 −0

Original line number	Diff line number	Diff line
		@@ -289,6 +289,14 @@ java_defaults {
		"staledataclass-annotation-processor",
		"error_prone_android_framework",
		],
		// Exports needed for staledataclass-annotation-processor, see b/139342589.
		javacflags: [
		"-J--add-modules=jdk.compiler",
		"-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED",
		"-J--add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED",
		"-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED",
		"-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED",
		],
		required: [
		// TODO(b/120066492): remove default_television.xml when the build system
		// propagates "required" properly.

tests/Codegen/Android.bp

+8 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,14 @@ android_test {
		plugins: [
		"staledataclass-annotation-processor",
		],
		// Exports needed for staledataclass-annotation-processor, see b/139342589.
		javacflags: [
		"-J--add-modules=jdk.compiler",
		"-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED",
		"-J--add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED",
		"-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED",
		"-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED",
		],
		static_libs: [
		"junit",
		"hamcrest",

tools/processors/staledataclass/Android.bp

+7 −11

Original line number	Diff line number	Diff line
		@@ -22,9 +22,6 @@ java_plugin {
		static_libs: [
		"codegen-version-info",
		],
		// The --add-modules/exports flags below don't work for kotlinc yet, so pin this module to Java language level 8 (see b/139342589):
		java_version: "1.8",
		openjdk9: {
		javacflags: [
		"--add-modules=jdk.compiler",
		"--add-exports jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED",
		@@ -32,7 +29,6 @@ java_plugin {
		"--add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED",
		"--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED",
		],
		},

		use_tools_jar: true,
		}

tools/processors/staledataclass/src/android/processor/staledataclass/StaleDataclassProcessor.kt

+1 −0

Original line number	Diff line number	Diff line
		@@ -14,6 +14,7 @@
		* limitations under the License.
		*/

		@file:Suppress("JAVA_MODULE_DOES_NOT_EXPORT_PACKAGE")

		package android.processor.staledataclass