sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-03-25 09:25:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Clean-up manifest merge attributes.

Browse source 
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
This commit is contained in:
tonihei 2017-06-05 16:03:39 -07:00 committed by Oliver Woodman
parent 10c2d3156b
commit edbc2046e2
9 changed files with 9 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
extensions/cronet/src/androidTest/AndroidManifest.xml
View file

@ -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>

3
extensions/flac/src/androidTest/AndroidManifest.xml
View file

@ -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>

3
extensions/opus/src/androidTest/AndroidManifest.xml
View file

@ -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>

3
extensions/vp9/src/androidTest/AndroidManifest.xml
View file

@ -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>

3
library/core/src/androidTest/AndroidManifest.xml
View file

@ -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>

3
library/dash/src/androidTest/AndroidManifest.xml
View file

@ -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>

3
library/hls/src/androidTest/AndroidManifest.xml
View file

@ -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>

3
library/smoothstreaming/src/androidTest/AndroidManifest.xml
View file

@ -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>

3
playbacktests/src/androidTest/AndroidManifest.xml
View file

@ -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>