diff options
| author | Santiago Seifert <aquilescanta@google.com> | 2020-08-07 10:02:28 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-08-07 10:02:28 +0000 |
| commit | a52141c6caca144687ba3991f3b4aa12ecccb0d5 (patch) | |
| tree | a594c5f74bffabf8b29bd6fab17faed798e63a2b | |
| parent | eddf0c94d2d2245507a3d433477fa79dbbb9309f (diff) | |
| parent | f92d07e5f95c9ae0a0248a0b99dcb736da2a1272 (diff) | |
| download | base-a52141c6caca144687ba3991f3b4aa12ecccb0d5.tar.gz | |
Merge "Add updatable-media jarjar rules to framework-all" into rvc-dev
| -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 |