From 66d2b76a6c63e0967ab08fbedfe38a300e90cef6 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Fri, 6 Apr 2018 03:01:14 -0700
Subject: [PATCH] Remove test max SDK version overrides.

These don't seem to be needed anymore. All tests run without them in gradle
and Blaze.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=191867518
---
 extensions/cast/src/test/AndroidManifest.xml      |  7 +------
 extensions/cronet/src/test/AndroidManifest.xml    |  7 +------
 .../flac/src/androidTest/AndroidManifest.xml      |  2 --
 extensions/ima/src/main/AndroidManifest.xml       | 15 +++++++++++++++
 .../opus/src/androidTest/AndroidManifest.xml      |  2 --
 .../vp9/src/androidTest/AndroidManifest.xml       |  2 --
 library/core/src/androidTest/AndroidManifest.xml  |  2 --
 library/core/src/test/AndroidManifest.xml         |  7 +------
 library/dash/src/test/AndroidManifest.xml         |  7 +------
 library/hls/src/test/AndroidManifest.xml          |  7 +------
 .../smoothstreaming/src/test/AndroidManifest.xml  |  7 +------
 playbacktests/src/androidTest/AndroidManifest.xml |  2 --
 testutils/src/test/AndroidManifest.xml            |  7 +------
 13 files changed, 22 insertions(+), 52 deletions(-)

diff --git a/extensions/cast/src/test/AndroidManifest.xml b/extensions/cast/src/test/AndroidManifest.xml
index 3f34bbb1f5..aea8bda663 100644
--- a/extensions/cast/src/test/AndroidManifest.xml
+++ b/extensions/cast/src/test/AndroidManifest.xml
@@ -14,9 +14,4 @@
      limitations under the License.
 -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.android.exoplayer2.ext.cast.test">
-
-  <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="26"/>
-
-</manifest>
+<manifest package="com.google.android.exoplayer2.ext.cast.test"/>
diff --git a/extensions/cronet/src/test/AndroidManifest.xml b/extensions/cronet/src/test/AndroidManifest.xml
index a1512ae605..82cffe17c2 100644
--- a/extensions/cronet/src/test/AndroidManifest.xml
+++ b/extensions/cronet/src/test/AndroidManifest.xml
@@ -14,9 +14,4 @@
      limitations under the License.
 -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.android.exoplayer2.ext.cronet">
-
-  <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="26"/>
-
-</manifest>
+<manifest package="com.google.android.exoplayer2.ext.cronet"/>
diff --git a/extensions/flac/src/androidTest/AndroidManifest.xml b/extensions/flac/src/androidTest/AndroidManifest.xml
index 38a6bfc927..4e3925d8e3 100644
--- a/extensions/flac/src/androidTest/AndroidManifest.xml
+++ b/extensions/flac/src/androidTest/AndroidManifest.xml
@@ -18,8 +18,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.google.android.exoplayer2.ext.flac.test">
 
-  <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="27"/>
-
   <application android:debuggable="true"
       android:allowBackup="false"
       tools:ignore="MissingApplicationIcon,HardcodedDebugMode">
diff --git a/extensions/ima/src/main/AndroidManifest.xml b/extensions/ima/src/main/AndroidManifest.xml
index 22fb518c58..1bb79ff21d 100644
--- a/extensions/ima/src/main/AndroidManifest.xml
+++ b/extensions/ima/src/main/AndroidManifest.xml
@@ -1,3 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.google.android.exoplayer2.ext.ima">
   <meta-data android:name="com.google.android.gms.version"
diff --git a/extensions/opus/src/androidTest/AndroidManifest.xml b/extensions/opus/src/androidTest/AndroidManifest.xml
index 2d56e8d1a7..9e7f05051e 100644
--- a/extensions/opus/src/androidTest/AndroidManifest.xml
+++ b/extensions/opus/src/androidTest/AndroidManifest.xml
@@ -18,8 +18,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.google.android.exoplayer2.ext.opus.test">
 
-  <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="27"/>
-
   <application android:debuggable="true"
       android:allowBackup="false"
       tools:ignore="MissingApplicationIcon,HardcodedDebugMode">
diff --git a/extensions/vp9/src/androidTest/AndroidManifest.xml b/extensions/vp9/src/androidTest/AndroidManifest.xml
index 152ce2f533..c7ed3d7fb2 100644
--- a/extensions/vp9/src/androidTest/AndroidManifest.xml
+++ b/extensions/vp9/src/androidTest/AndroidManifest.xml
@@ -18,8 +18,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.google.android.exoplayer2.ext.vp9.test">
 
-  <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="27"/>
-
   <application android:debuggable="true"
       android:allowBackup="false"
       tools:ignore="MissingApplicationIcon,HardcodedDebugMode">
diff --git a/library/core/src/androidTest/AndroidManifest.xml b/library/core/src/androidTest/AndroidManifest.xml
index 38ae6b0b2d..1aa47c10f6 100644
--- a/library/core/src/androidTest/AndroidManifest.xml
+++ b/library/core/src/androidTest/AndroidManifest.xml
@@ -18,8 +18,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.google.android.exoplayer2.core.test">
 
-  <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="27"/>
-
   <application android:debuggable="true"
       android:allowBackup="false"
       tools:ignore="MissingApplicationIcon,HardcodedDebugMode">
diff --git a/library/core/src/test/AndroidManifest.xml b/library/core/src/test/AndroidManifest.xml
index f2a4cd6647..2cf0313256 100644
--- a/library/core/src/test/AndroidManifest.xml
+++ b/library/core/src/test/AndroidManifest.xml
@@ -14,9 +14,4 @@
      limitations under the License.
 -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.android.exoplayer2.core.test">
-
-  <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="26"/>
-
-</manifest>
+<manifest package="com.google.android.exoplayer2.core.test"/>
diff --git a/library/dash/src/test/AndroidManifest.xml b/library/dash/src/test/AndroidManifest.xml
index d18291d0ee..e20c1fbb9f 100644
--- a/library/dash/src/test/AndroidManifest.xml
+++ b/library/dash/src/test/AndroidManifest.xml
@@ -14,9 +14,4 @@
      limitations under the License.
 -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.android.exoplayer2.source.dash.test">
-
-  <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="25"/>
-
-</manifest>
+<manifest package="com.google.android.exoplayer2.source.dash.test"/>
diff --git a/library/hls/src/test/AndroidManifest.xml b/library/hls/src/test/AndroidManifest.xml
index 89fab4d9a2..326ff48b16 100644
--- a/library/hls/src/test/AndroidManifest.xml
+++ b/library/hls/src/test/AndroidManifest.xml
@@ -14,9 +14,4 @@
      limitations under the License.
 -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.android.exoplayer2.source.hls.test">
-
-  <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="26"/>
-
-</manifest>
+<manifest package="com.google.android.exoplayer2.source.hls.test" />
diff --git a/library/smoothstreaming/src/test/AndroidManifest.xml b/library/smoothstreaming/src/test/AndroidManifest.xml
index 61eb3caddf..712169a7d0 100644
--- a/library/smoothstreaming/src/test/AndroidManifest.xml
+++ b/library/smoothstreaming/src/test/AndroidManifest.xml
@@ -14,9 +14,4 @@
      limitations under the License.
 -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.android.exoplayer2.source.smoothstreaming.test">
-
-  <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="26"/>
-
-</manifest>
+<manifest package="com.google.android.exoplayer2.source.smoothstreaming.test"/>
diff --git a/playbacktests/src/androidTest/AndroidManifest.xml b/playbacktests/src/androidTest/AndroidManifest.xml
index 328834e155..d4fd0b61f1 100644
--- a/playbacktests/src/androidTest/AndroidManifest.xml
+++ b/playbacktests/src/androidTest/AndroidManifest.xml
@@ -21,8 +21,6 @@
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-permission android:name="android.permission.WAKE_LOCK"/>
 
-  <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="27"/>
-
   <application android:debuggable="true"
       android:allowBackup="false"
       tools:ignore="MissingApplicationIcon,HardcodedDebugMode">
diff --git a/testutils/src/test/AndroidManifest.xml b/testutils/src/test/AndroidManifest.xml
index bea920852c..e30ea1c3ca 100644
--- a/testutils/src/test/AndroidManifest.xml
+++ b/testutils/src/test/AndroidManifest.xml
@@ -14,9 +14,4 @@
      limitations under the License.
 -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.android.exoplayer2.testutil.test">
-
-  <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="26"/>
-
-</manifest>
+<manifest package="com.google.android.exoplayer2.testutil.test"/>