From edbc2046e2c6291e0e229638c78a507ea491c996 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Mon, 5 Jun 2017 16:03:39 -0700
Subject: [PATCH] Clean-up manifest merge attributes.

1. Remove tools:replace in manifest files. This attribute is only needed to establish priority when two manifests are merged and have the same attribute with different values.
As this is not happening here, the attributes can be removed.

2. Some BUILD files also define a deprecated manifest merge strategy different from the android default merge strategy. For consistency these are set to "android'.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=158075128
---
 extensions/cronet/src/androidTest/AndroidManifest.xml       | 3 +--
 extensions/flac/src/androidTest/AndroidManifest.xml         | 3 +--
 extensions/opus/src/androidTest/AndroidManifest.xml         | 3 +--
 extensions/vp9/src/androidTest/AndroidManifest.xml          | 3 +--
 library/core/src/androidTest/AndroidManifest.xml            | 3 +--
 library/dash/src/androidTest/AndroidManifest.xml            | 3 +--
 library/hls/src/androidTest/AndroidManifest.xml             | 3 +--
 library/smoothstreaming/src/androidTest/AndroidManifest.xml | 3 +--
 playbacktests/src/androidTest/AndroidManifest.xml           | 3 +--
 9 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/extensions/cronet/src/androidTest/AndroidManifest.xml b/extensions/cronet/src/androidTest/AndroidManifest.xml
index 2f45a1a2e5..1f371a1864 100644
--- a/extensions/cronet/src/androidTest/AndroidManifest.xml
+++ b/extensions/cronet/src/androidTest/AndroidManifest.xml
@@ -28,7 +28,6 @@
 
   <instrumentation
       android:name="android.test.InstrumentationTestRunner"
-      android:targetPackage="com.google.android.exoplayer.ext.cronet"
-      tools:replace="android:targetPackage"/>
+      android:targetPackage="com.google.android.exoplayer.ext.cronet"/>
 
 </manifest>
diff --git a/extensions/flac/src/androidTest/AndroidManifest.xml b/extensions/flac/src/androidTest/AndroidManifest.xml
index 0a62db3bb5..73032ab50c 100644
--- a/extensions/flac/src/androidTest/AndroidManifest.xml
+++ b/extensions/flac/src/androidTest/AndroidManifest.xml
@@ -28,7 +28,6 @@
 
   <instrumentation
       android:targetPackage="com.google.android.exoplayer2.ext.flac.test"
-      android:name="android.test.InstrumentationTestRunner"
-      tools:replace="android:targetPackage"/>
+      android:name="android.test.InstrumentationTestRunner"/>
 
 </manifest>
diff --git a/extensions/opus/src/androidTest/AndroidManifest.xml b/extensions/opus/src/androidTest/AndroidManifest.xml
index c819529692..e77590dc65 100644
--- a/extensions/opus/src/androidTest/AndroidManifest.xml
+++ b/extensions/opus/src/androidTest/AndroidManifest.xml
@@ -28,7 +28,6 @@
 
   <instrumentation
       android:targetPackage="com.google.android.exoplayer2.ext.opus.test"
-      android:name="android.test.InstrumentationTestRunner"
-      tools:replace="android:targetPackage"/>
+      android:name="android.test.InstrumentationTestRunner"/>
 
 </manifest>
diff --git a/extensions/vp9/src/androidTest/AndroidManifest.xml b/extensions/vp9/src/androidTest/AndroidManifest.xml
index d9fa8af2c3..b8b28fc346 100644
--- a/extensions/vp9/src/androidTest/AndroidManifest.xml
+++ b/extensions/vp9/src/androidTest/AndroidManifest.xml
@@ -28,7 +28,6 @@
 
   <instrumentation
       android:targetPackage="com.google.android.exoplayer2.ext.vp9.test"
-      android:name="android.test.InstrumentationTestRunner"
-      tools:replace="android:targetPackage"/>
+      android:name="android.test.InstrumentationTestRunner"/>
 
 </manifest>
diff --git a/library/core/src/androidTest/AndroidManifest.xml b/library/core/src/androidTest/AndroidManifest.xml
index 9eab386b51..2634152c98 100644
--- a/library/core/src/androidTest/AndroidManifest.xml
+++ b/library/core/src/androidTest/AndroidManifest.xml
@@ -28,7 +28,6 @@
 
   <instrumentation
       android:targetPackage="com.google.android.exoplayer2.core.test"
-      android:name="android.test.InstrumentationTestRunner"
-      tools:replace="android:targetPackage"/>
+      android:name="android.test.InstrumentationTestRunner"/>
 
 </manifest>
diff --git a/library/dash/src/androidTest/AndroidManifest.xml b/library/dash/src/androidTest/AndroidManifest.xml
index ac2511d3bd..a9b143253f 100644
--- a/library/dash/src/androidTest/AndroidManifest.xml
+++ b/library/dash/src/androidTest/AndroidManifest.xml
@@ -28,7 +28,6 @@
 
   <instrumentation
       android:targetPackage="com.google.android.exoplayer2.source.dash.test"
-      android:name="android.test.InstrumentationTestRunner"
-      tools:replace="android:targetPackage"/>
+      android:name="android.test.InstrumentationTestRunner"/>
 
 </manifest>
diff --git a/library/hls/src/androidTest/AndroidManifest.xml b/library/hls/src/androidTest/AndroidManifest.xml
index ac0857fc3f..dcf6c2f940 100644
--- a/library/hls/src/androidTest/AndroidManifest.xml
+++ b/library/hls/src/androidTest/AndroidManifest.xml
@@ -28,7 +28,6 @@
 
   <instrumentation
       android:targetPackage="com.google.android.exoplayer2.source.hls.test"
-      android:name="android.test.InstrumentationTestRunner"
-      tools:replace="android:targetPackage"/>
+      android:name="android.test.InstrumentationTestRunner"/>
 
 </manifest>
diff --git a/library/smoothstreaming/src/androidTest/AndroidManifest.xml b/library/smoothstreaming/src/androidTest/AndroidManifest.xml
index 9f62e26867..ab314ce806 100644
--- a/library/smoothstreaming/src/androidTest/AndroidManifest.xml
+++ b/library/smoothstreaming/src/androidTest/AndroidManifest.xml
@@ -28,7 +28,6 @@
 
   <instrumentation
       android:targetPackage="com.google.android.exoplayer2.source.smoothstreaming.test"
-      android:name="android.test.InstrumentationTestRunner"
-      tools:replace="android:targetPackage"/>
+      android:name="android.test.InstrumentationTestRunner"/>
 
 </manifest>
diff --git a/playbacktests/src/androidTest/AndroidManifest.xml b/playbacktests/src/androidTest/AndroidManifest.xml
index 2f7bbe6d7c..64b927655f 100644
--- a/playbacktests/src/androidTest/AndroidManifest.xml
+++ b/playbacktests/src/androidTest/AndroidManifest.xml
@@ -36,7 +36,6 @@
 
   <instrumentation
       android:targetPackage="com.google.android.exoplayer2.playbacktests"
-      android:name="android.test.InstrumentationTestRunner"
-      tools:replace="android:targetPackage"/>
+      android:name="android.test.InstrumentationTestRunner"/>
 
 </manifest>