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

Commit 23efb3ab authored by Anton Hansson's avatar Anton Hansson Committed by Android (Google) Code Review
Browse files

Merge "Revert "Inline usage of jarjar_rules.txt"" into sc-dev

parents 44061d90 dffc59c1

Android.bp

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

}



filegroup {

    name: "framework-jarjar-rules",

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

}



java_defaults {

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

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

        "--multi-dex",

    ],

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

    jarjar_rules: ":framework-jarjar-rules",

    javac_shard_size: 150,

    plugins: [

        "view-inspector-annotation-processor",