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

Commit db23306e authored by Artur Satayev's avatar Artur Satayev Committed by satayev
Browse files

Export change id processor. 

- Don't declare the plugin directly, it is exported via java_library that defines the sources.
- Remove unneeded framework-annotation-proc.

Bug: 152220864
Test: m && diff merged_compat_config.xml
Change-Id: Ie750b5391229d21679a8610780b9f8d4a997e204
Merged-In: Ie750b5391229d21679a8610780b9f8d4a997e204
parent f87fe63a

Android.bp

+2 −16
Original line number Diff line number Diff line
@@ -524,23 +524,9 @@ java_library { 
    ],

}



java_library {

    name: "framework-annotation-proc",

    defaults: ["framework-defaults"],

    srcs: [":framework-all-sources"],

    libs: [

        "app-compat-annotations",

        "unsupportedappusage",

    ],

    installable: false,

    plugins: [

        "compat-changeid-annotation-processor",

    ],

}



platform_compat_config {

   name: "framework-platform-compat-config",

    src: ":framework-annotation-proc",

   src: ":framework-minus-apex",

}



// A library including just UnsupportedAppUsage.java classes.

services/Android.bp

+2 −6
Original line number Diff line number Diff line
@@ -75,10 +75,6 @@ java_library { 
        "framework-tethering-stubs-module_libs_api",

    ],



    plugins: [

        "compat-changeid-annotation-processor",

    ],



    // Uncomment to enable output of certain warnings (deprecated, unchecked)

    //javacflags: ["-Xlint"],

services/core/Android.bp

+0 −4
Original line number Diff line number Diff line
@@ -56,10 +56,6 @@ java_library_static { 
        "dnsresolver_aidl_interface-V2-java",

        "netd_event_listener_interface-java",

    ],



    plugins: [

        "compat-changeid-annotation-processor",

    ],

}



java_genrule {