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

Commit c6a0cddf authored by Anton Hansson's avatar Anton Hansson Committed by Gerrit Code Review
Browse files

Merge "Inline usage of jarjar_rules.txt"

parents 246c14d6 1461c6ef
Loading
Loading
Loading
Loading
+1 −6
Original line number Diff line number Diff line
@@ -252,11 +252,6 @@ java_library {
    installable: false,
}

filegroup {
    name: "framework-jarjar-rules",
    srcs: ["framework-jarjar-rules.txt"],
}

java_library {
    name: "framework-minus-apex",
    defaults: ["framework-aidl-export-defaults"],
@@ -273,7 +268,7 @@ java_library {
        "--multi-dex",
    ],
    installable: true,
    jarjar_rules: ":framework-jarjar-rules",
    jarjar_rules: "framework-jarjar-rules.txt",
    javac_shard_size: 150,
    plugins: [
        "view-inspector-annotation-processor",