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

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

Merge "Revert "Inline usage of jarjar_rules.txt"" am: 76660552

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

Change-Id: I46c2379af651e60d42bca0267a6de0234d16b3c9
parents efdf869b 76660552
Loading
Loading
Loading
Loading
+6 −1
Original line number Diff line number Diff line
@@ -254,6 +254,11 @@ 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"],
@@ -270,7 +275,7 @@ java_library {
        "--multi-dex",
    ],
    installable: true,
    jarjar_rules: "framework-jarjar-rules.txt",
    jarjar_rules: ":framework-jarjar-rules",
    javac_shard_size: 150,
    plugins: [
        "view-inspector-annotation-processor",