diff options
| author | 2020-08-07 10:18:15 +0000 | |
|---|---|---|
| committer | 2020-08-07 10:18:15 +0000 | |
| commit | a1299a938db9dbb54c5aca7f86f0bb582bca5142 (patch) | |
| tree | d64524b92f2bb272d602b2a562405098e34cf796 | |
| parent | 26187e2fba58232b720e050a0d9c9254c6ebe810 (diff) | |
| parent | a52141c6caca144687ba3991f3b4aa12ecccb0d5 (diff) | |
Merge "Add updatable-media jarjar rules to framework-all" into rvc-dev am: a52141c6ca
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12324556
Change-Id: I14f83d532922ffcd343d1efd48b28513b5672154
| -rw-r--r-- | framework-jarjar-rules.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/framework-jarjar-rules.txt b/framework-jarjar-rules.txt index d8af726ffa72..70dedb8179b0 100644 --- a/framework-jarjar-rules.txt +++ b/framework-jarjar-rules.txt @@ -1,2 +1,6 @@ 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 |