diff options
| author | 2020-09-08 15:26:46 +0000 | |
|---|---|---|
| committer | 2020-09-08 15:26:46 +0000 | |
| commit | 2b5daaae4fa8e07299be1fd98a086d59935b2747 (patch) | |
| tree | 89a77e4e930cb5a3375c5fe575fc179075807682 | |
| parent | f47bc65580bc40a436f8e18df6107d25250bf1c3 (diff) | |
| parent | a6e8bee88c284e2b03f1a10da3bb8cc40b374b00 (diff) | |
Merge "Revert "Add updatable-media jarjar rules to framework-all"" into rvc-dev-plus-aosp am: c7ecd67a69 am: f68b135eed am: a6e8bee88c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12534165
Change-Id: Ic4ace22df53ec560b9683d8ad32b183109041790
| -rw-r--r-- | framework-jarjar-rules.txt | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/framework-jarjar-rules.txt b/framework-jarjar-rules.txt index 70dedb8179b0..d8af726ffa72 100644 --- a/framework-jarjar-rules.txt +++ b/framework-jarjar-rules.txt @@ -1,6 +1,2 @@ rule android.hidl.** android.internal.hidl.@1 rule android.net.wifi.WifiAnnotations* android.internal.wifi.WifiAnnotations@1 - -# Hide media mainline module implementation classes to avoid collisions with -# app-bundled ExoPlayer classes. -rule com.google.android.exoplayer2.** android.media.internal.exo.@1 |