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

Commit 59bb7b7e authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Moving ImmutabilityProcessor.kt to JSR-269 spec" into main

parents f494ab5e 418f3b68

tools/processors/immutability/Android.bp

+0 −12
Original line number Diff line number Diff line
@@ -16,10 +16,6 @@ java_library_host { 
    use_tools_jar: true,

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

    ],

}
@@ -29,10 +25,6 @@ java_plugin { 
    static_libs: ["ImmutabilityAnnotationProcessorHostLibrary"],

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

    ],

}
@@ -65,10 +57,6 @@ java_test_host { 
    },

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

    ],

    test_config_template: "AndroidTestTemplate.xml",

}

tools/processors/immutability/AndroidTestTemplate.xml

+0 −4
Original line number Diff line number Diff line
@@ -24,9 +24,5 @@ 
    <test class="com.android.tradefed.testtype.IsolatedHostTest" >

        <option name="jar" value="{MODULE}.jar" />

        <option name="java-flags" value="--add-modules=jdk.compiler"/>

        <option name="java-flags" value="--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>

        <option name="java-flags" value="--add-exports=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED"/>

        <option name="java-flags" value="--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>

        <option name="java-flags" value="--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>

    </test>

</configuration>

tools/processors/immutability/src/android/processor/immutability/ImmutabilityProcessor.kt

+182 −141

File changed.

Preview size limit exceeded, changes collapsed.