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

Commit cb904bcd authored by Anton Hansson's avatar Anton Hansson Committed by Automerger Merge Worker
Browse files

Merge "Revert "Inline usage of jarjar_rules.txt"" into sc-dev am: 23efb3ab... 

Merge "Revert "Inline usage of jarjar_rules.txt"" into sc-dev am: 23efb3ab am: eff53d00 am: 43d664ae

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

Change-Id: Ifdc957f92bd26ca3951ca2b24276936188de242c
parents ad9cd914 43d664ae

Android.bp

+6 −1
Original line number Original line Diff line number Diff line
@@ -273,6 +273,11 @@ java_library { 
    installable: false,

    installable: false,

}

}





filegroup {

    name: "framework-jarjar-rules",

    srcs: ["framework-jarjar-rules.txt"],

}



java_defaults {

java_defaults {

    name: "framework-minus-apex-defaults",

    name: "framework-minus-apex-defaults",

    defaults: ["framework-aidl-export-defaults"],

    defaults: ["framework-aidl-export-defaults"],
@@ -294,7 +299,7 @@ java_defaults { 
        "--core-library",

        "--core-library",

        "--multi-dex",

        "--multi-dex",

    ],

    ],

    jarjar_rules: "framework-jarjar-rules.txt",

    jarjar_rules: ":framework-jarjar-rules",

    javac_shard_size: 150,

    javac_shard_size: 150,

    plugins: [

    plugins: [

        "view-inspector-annotation-processor",

        "view-inspector-annotation-processor",