Commit edbc2046 by tonihei Committed by Oliver Woodman

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
parent 10c2d315
......@@ -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>
......@@ -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>
......@@ -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>
......@@ -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>
......@@ -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>
......@@ -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>
......@@ -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>
......@@ -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>
......@@ -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>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment