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

Commit eac2de88 authored by Sam Delmerico's avatar Sam Delmerico Committed by Automerger Merge Worker
Browse files

Merge "disable usage of plugins as static libs" am: f111beaa 

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



Change-Id: I010aeaf97b3027eabc397bff39e1f95ba84e17e8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents aa21aea9 f111beaa

tools/processors/intdef_mappings/Android.bp

+14 −8
Original line number Diff line number Diff line
@@ -7,26 +7,32 @@ package { 
    default_applicable_licenses: ["frameworks_base_license"],

}



java_plugin {

    name: "intdef-annotation-processor",



    processor_class: "android.processor.IntDefProcessor",

java_library_host {

    name: "libintdef-annotation-processor",



    srcs: [

        ":framework-annotations",

        "src/**/*.java",

        "src/**/*.kt"

        "src/**/*.kt",

    ],



    use_tools_jar: true,

}



java_plugin {

    name: "intdef-annotation-processor",



    processor_class: "android.processor.IntDefProcessor",



    static_libs: ["libintdef-annotation-processor"],

}



java_test_host {

    name: "intdef-annotation-processor-test",



    srcs: [

        "test/**/*.java",

        "test/**/*.kt"

        "test/**/*.kt",

    ],

    java_resource_dirs: ["test/resources"],
@@ -35,7 +41,7 @@ java_test_host { 
        "truth-prebuilt",

        "junit",

        "guava",

        "intdef-annotation-processor"

        "libintdef-annotation-processor",

    ],



    test_suites: ["general-tests"],

tools/processors/view_inspector/Android.bp

+13 −5
Original line number Diff line number Diff line
@@ -7,10 +7,8 @@ package { 
    default_applicable_licenses: ["frameworks_base_license"],

}



java_plugin {

    name: "view-inspector-annotation-processor",



    processor_class: "android.processor.view.inspector.PlatformInspectableProcessor",

java_library_host {

    name: "libview-inspector-annotation-processor",



    srcs: ["src/java/**/*.java"],

    java_resource_dirs: ["src/resources"],
@@ -23,6 +21,16 @@ java_plugin { 
    use_tools_jar: true,

}



java_plugin {

    name: "view-inspector-annotation-processor",



    processor_class: "android.processor.view.inspector.PlatformInspectableProcessor",



    static_libs: [

        "libview-inspector-annotation-processor",

    ],

}



java_test_host {

    name: "view-inspector-annotation-processor-test",
@@ -32,7 +40,7 @@ java_test_host { 
    static_libs: [

        "junit",

        "guava",

        "view-inspector-annotation-processor"

        "libview-inspector-annotation-processor",

    ],



    test_suites: ["general-tests"],