From 1461c6ef55acc8d2c28fc767cf566d7437a4879c Mon Sep 17 00:00:00 2001 From: Anton Hansson Date: Mon, 12 Apr 2021 18:24:01 +0100 Subject: [PATCH] Inline usage of jarjar_rules.txt No need to have a filegroup for this. This also has the nice side-effect of avoiding modules outside this directory depending on the file. Bug: 185128417 Test: m Merged-In: Idef6f2fd89116490c43427bba55202f46377a83d Change-Id: Idef6f2fd89116490c43427bba55202f46377a83d --- Android.bp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/Android.bp b/Android.bp index 1415b6a781364..084c9f51d12e0 100644 --- a/Android.bp +++ b/Android.bp @@ -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",