From f92d07e5f95c9ae0a0248a0b99dcb736da2a1272 Mon Sep 17 00:00:00 2001 From: Santiago Seifert Date: Thu, 6 Aug 2020 15:20:11 +0100 Subject: 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 --- framework-jarjar-rules.txt | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'framework-jarjar-rules.txt') 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 -- cgit v1.2.3