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

Commit 06fa6a7e authored by Jiyong Park's avatar Jiyong Park Committed by android-build-merger
Browse files

Merge "Revert "Replace framework-annotation-proc java lib with framework-all"" 

am: 546f68a6

Change-Id: Ie28ad6fd9943846fdd74236a43c65adafc4028fa
parents 5fd6bb96 546f68a6

Android.bp

+10 −2
Original line number Diff line number Diff line
@@ -456,6 +456,14 @@ java_library { 
    srcs: [":framework-all-sources"],

    installable: false,

    libs: ["app-compat-annotations"],

}



java_library {

    name: "framework-annotation-proc",

    defaults: ["framework-defaults"],

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

    libs: ["app-compat-annotations"],

    installable: false,

    plugins: [

        "unsupportedappusage-annotation-processor",

        "compat-changeid-annotation-processor",
@@ -464,7 +472,7 @@ java_library { 


platform_compat_config {

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

    src: ":framework-all",

    src: ":framework-annotation-proc",

}



// A library including just UnsupportedAppUsage.java classes.
@@ -1556,7 +1564,7 @@ aidl_mapping { 


genrule {

    name: "framework-annotation-proc-index",

    srcs: [":framework-all"],

    srcs: [":framework-annotation-proc"],

    cmd: "unzip -qp $(in) unsupportedappusage/unsupportedappusage_index.csv > $(out)",

    out: ["unsupportedappusage_index.csv"],

    dist: {