Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I5f0bd5c79bbdca6a9a3256ac9c3fb376ec5ba6ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Sorin Basca
2022-09-28 19:14:33 +00:00
committed by Automerger Merge Worker
parent 417bf37aa6 818cc23210
commit 7ef2a66679
4 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Android.bp
View File

@@ -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.

8
tests/Codegen/Android.bp
View File

@@ -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",

18
tools/processors/staledataclass/Android.bp
View File

@@ -22,17 +22,13 @@ 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",
"--add-exports jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED",
"--add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED",
"--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED",
],
},
javacflags: [
"--add-modules=jdk.compiler",
"--add-exports jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED",
"--add-exports jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED",
"--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,
}

1
tools/processors/staledataclass/src/android/processor/staledataclass/StaleDataclassProcessor.kt
View File

@@ -14,6 +14,7 @@
* limitations under the License.
*/
@file:Suppress("JAVA_MODULE_DOES_NOT_EXPORT_PACKAGE")
package android.processor.staledataclass