diff options
| author | Santiago Seifert <aquilescanta@google.com> | 2020-08-06 15:20:11 +0100 |
|---|---|---|
| committer | Santiago Seifert <aquilescanta@google.com> | 2020-08-06 23:15:18 +0100 |
| commit | f92d07e5f95c9ae0a0248a0b99dcb736da2a1272 (patch) | |
| tree | 379574a173b84b7a520b08496fa1d01a778d0f65 | |
| parent | 3ff2a5cbd1407004ae064d570f6fb79b309f813d (diff) | |
| download | base-f92d07e5f95c9ae0a0248a0b99dcb736da2a1272.tar.gz | |
Add updatable-media jarjar rules to framework-all
Prevents the robolectric shadows jar from including ExoPlayer
symbols, which collide with app-bundled class files.
Bug: 161753405
Test: Manually checked robolectric jar contents.
Test: Built sargo-userdebug, flashed and tested on physical device.
Change-Id: I3bdc9e0b22cd0dea40f5bad15b0e6c619d32faf6
| -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 |