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

Commit f9172bd7 authored by Artur Satayev's avatar Artur 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
(cherry picked from commit 9f5a5623)
parent c02e0d8c

Android.bp

+1 −25
Original line number Diff line number Diff line
@@ -548,33 +548,9 @@ java_library { 
    ],

}



java_library {

    name: "framework-annotation-proc",

    srcs: [

        ":framework-all-sources",

        "core/java/**/*.logtags",

    ],

    sdk_version: "core_platform",

    libs: [

        "app-compat-annotations",

        "ext",

        "unsupportedappusage",

    ],



    installable: false,

    plugins: [

        "compat-changeid-annotation-processor",

    ],

    static_libs: [

        "framework-internal-utils",

        "exoplayer2-extractor",

        "android.hardware.wifi-V1.0-java-constants",

    ]

}



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

+0 −4
Original line number Diff line number Diff line
@@ -81,10 +81,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
@@ -130,10 +130,6 @@ java_library_static { 
        "netd_event_listener_interface-java",

        "overlayable_policy_aidl-java",

    ],



    plugins: [

        "compat-changeid-annotation-processor",

    ],

}



java_genrule {

services/devicepolicy/Android.bp

+0 −4
Original line number Diff line number Diff line
@@ -13,8 +13,4 @@ java_library_static { 
        "services.core",

        "app-compat-annotations",

    ],



    plugins: [

        "compat-changeid-annotation-processor",

    ],

}