From 631291cd32f461f5959b1c6ed8339397fd576330 Mon Sep 17 00:00:00 2001
From: Anton Hansson <hansson@google.com>
Date: Wed, 19 Aug 2020 15:39:00 +0100
Subject: [PATCH] Revert "Add updatable-media jarjar rules to framework-all"

We no longer need this jarjar rule because we are not re-compiling
exoplayer.

This reverts commit f92d07e5f95c9ae0a0248a0b99dcb736da2a1272.

Bug: 149906971
Test: m && \
      unzip -l out/soong/.intermediates/frameworks/base/framework-all/\
      android_common/combined/framework-all.jar \
      | grep exo \
      | grep -v internal
      (no exoplayer classes)
Change-Id: Ic4d7847875797be47e02987337bf685bfe1e6605
---
 framework-jarjar-rules.txt | 4 ----
 1 file changed, 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