diff options
| author | 2019-11-20 20:51:43 +0000 | |
|---|---|---|
| committer | 2019-11-20 20:55:45 +0000 | |
| commit | 7094b767829e6da03aa97454eceb43771b2983cc (patch) | |
| tree | cade80d49eb7856ea68ad31b9795d442278fb57a | |
| parent | 64ed3ec44c68664ade3c7fa04f692a7144479ca6 (diff) | |
Remove unnecessary jarjar rule from framework/base
Bug: 144765333
Test: Not applicable.
Change-Id: Ia092b7fb1156652b69080030673b0e8427e745a0
| -rw-r--r-- | Android.bp | 2 | ||||
| -rw-r--r-- | framework_jarjar_rules.txt | 2 | ||||
| -rw-r--r-- | jarjar_rules_hidl.txt | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/Android.bp b/Android.bp index 611d4ba18367..f2ef47d4a173 100644 --- a/Android.bp +++ b/Android.bp @@ -390,7 +390,7 @@ java_defaults { filegroup { name: "framework-jarjar-rules", - srcs: ["framework_jarjar_rules.txt"], + srcs: ["jarjar_rules_hidl.txt"], } filegroup { diff --git a/framework_jarjar_rules.txt b/framework_jarjar_rules.txt deleted file mode 100644 index 77b9ee654c1d..000000000000 --- a/framework_jarjar_rules.txt +++ /dev/null @@ -1,2 +0,0 @@ -rule android.hidl.** android.internal.hidl.@1 -rule com.google.android.exoplayer2.** android.media.internal.exo.@1 diff --git a/jarjar_rules_hidl.txt b/jarjar_rules_hidl.txt new file mode 100644 index 000000000000..4b2331db7c34 --- /dev/null +++ b/jarjar_rules_hidl.txt @@ -0,0 +1 @@ +rule android.hidl.** android.internal.hidl.@1 |