Update SDK / Tools.

- Centralise compileSdkVersion, targetSdkVersion and buildToolsVersion in a single place for gradle. - Bump compileSdkVersion and targetSdkVersion to 24. - Bump com.android.tools.build version to re-enable instant start. - Bump targetSdkVersion in manifests (needed for internal builds). - Use standard expandable_list_item from Android in the demo app, since ours doesn't look right when targeting API level 24. We were also setting the theme on the wrong element in the manifest, so I'm removing that line. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=131929216
2026-03-25 09:25:53 +00:00 · 2016-09-01 03:27:04 -07:00 · 2016-09-01 03:27:04 -07:00 · a779eabdc5
commit a779eabdc5
parent c5114575fe
22 changed files with 45 additions and 86 deletions
--- a/demo/build.gradle
+++ b/demo/build.gradle
@ -14,13 +14,14 @@
 apply plugin: 'com.android.application'

 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.1"
+    compileSdkVersion project.ext.compileSdkVersion
+    buildToolsVersion project.ext.buildToolsVersion

    defaultConfig {
        minSdkVersion 16
-        targetSdkVersion 23
+        targetSdkVersion project.ext.targetSdkVersion
    }
+
    buildTypes {
        release {
            minifyEnabled false
--- a/demo/src/main/AndroidManifest.xml
+++ b/demo/src/main/AndroidManifest.xml
@ -17,13 +17,12 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
    package="com.google.android.exoplayer2.demo"
    android:versionCode="2000"
-    android:versionName="2.0.0"
-    android:theme="@style/RootTheme">
+    android:versionName="2.0.0">

  <uses-permission android:name="android.permission.INTERNET"/>
  <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>

-  <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23"/>
+  <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="24"/>

  <application
      android:label="@string/application_name"
--- a/demo/src/main/java/com/google/android/exoplayer2/demo/SampleChooserActivity.java
+++ b/demo/src/main/java/com/google/android/exoplayer2/demo/SampleChooserActivity.java
@ -303,8 +303,8 @@ public class SampleChooserActivity extends Activity {
        ViewGroup parent) {
      View view = convertView;
      if (view == null) {
-        view = LayoutInflater.from(context).inflate(R.layout.sample_chooser_inline_header, parent,
-            false);
+        view = LayoutInflater.from(context).inflate(android.R.layout.simple_expandable_list_item_1,
+            parent, false);
      }
      ((TextView) view).setText(getGroup(groupPosition).title);
      return view;
--- a/demo/src/main/res/layout/player_activity.xml
+++ b/demo/src/main/res/layout/player_activity.xml
@ -68,8 +68,7 @@
          android:layout_width="wrap_content"
          android:layout_height="wrap_content"
          android:text="@string/retry"
-          android:visibility="gone"
-          style="@style/DemoButton"/>
+          android:visibility="gone"/>

    </LinearLayout>

--- a/demo/src/main/res/layout/sample_chooser_inline_header.xml
+++ b/demo/src/main/res/layout/sample_chooser_inline_header.xml
@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2016 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.
-->
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:textStyle="bold"
-    android:textAllCaps="true"
-    android:textColor="@android:color/white"
-    android:textSize="14sp"
-    android:paddingStart="?android:attr/expandableListPreferredItemPaddingLeft"
-    android:paddingLeft="?android:attr/expandableListPreferredItemPaddingLeft"
-    android:paddingRight="8dp"
-    android:paddingEnd="8dp"
-    android:paddingTop="8dp"
-    android:paddingBottom="8dp"
-    android:background="#339999FF"/>
--- a/demo/src/main/res/values/styles.xml
+++ b/demo/src/main/res/values/styles.xml
@ -16,18 +16,9 @@

 <resources xmlns:android="http://schemas.android.com/apk/res/android">

-  <style name="RootTheme" parent="android:Theme.Holo">
-  </style>
-
-  <style name="PlayerTheme" parent="@style/RootTheme">
+  <style name="PlayerTheme" parent="android:Theme.Holo">
    <item name="android:windowNoTitle">true</item>
    <item name="android:windowBackground">@android:color/black</item>
  </style>

-  <style name="DemoButton">
-    <item name="android:layout_width">wrap_content</item>
-    <item name="android:layout_height">wrap_content</item>
-    <item name="android:minWidth">40dp</item>
-  </style>
-
 </resources>
--- a/extensions/cronet/build.gradle
+++ b/extensions/cronet/build.gradle
@ -14,12 +14,12 @@
 apply plugin: 'com.android.library'

 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.1"
+    compileSdkVersion project.ext.compileSdkVersion
+    buildToolsVersion project.ext.buildToolsVersion

    defaultConfig {
        minSdkVersion 9
-        targetSdkVersion 23
+        targetSdkVersion project.ext.targetSdkVersion
        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
    }

--- a/extensions/cronet/src/androidTest/AndroidManifest.xml
+++ b/extensions/cronet/src/androidTest/AndroidManifest.xml
@ -18,7 +18,7 @@
    xmlns:tools="http://schemas.android.com/tools"
    package="com.google.android.exoplayer.ext.cronet">

-  <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="23"/>
+  <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="24"/>

  <application android:debuggable="true"
      android:allowBackup="false"
--- a/extensions/cronet/src/main/AndroidManifest.xml
+++ b/extensions/cronet/src/main/AndroidManifest.xml
@ -18,6 +18,4 @@

    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>

-    <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="23"/>
-
 </manifest>
--- a/extensions/ffmpeg/build.gradle
+++ b/extensions/ffmpeg/build.gradle
@ -14,12 +14,12 @@
 apply plugin: 'com.android.library'

 android {
-    compileSdkVersion 23
-    buildToolsVersion '23.0.1'
+    compileSdkVersion project.ext.compileSdkVersion
+    buildToolsVersion project.ext.buildToolsVersion

    defaultConfig {
        minSdkVersion 9
-        targetSdkVersion 23
+        targetSdkVersion project.ext.targetSdkVersion
    }

    buildTypes {
--- a/extensions/flac/build.gradle
+++ b/extensions/flac/build.gradle
@ -14,12 +14,12 @@
 apply plugin: 'com.android.library'

 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.1"
+    compileSdkVersion project.ext.compileSdkVersion
+    buildToolsVersion project.ext.buildToolsVersion

    defaultConfig {
        minSdkVersion 9
-        targetSdkVersion 23
+        targetSdkVersion project.ext.targetSdkVersion
    }

    buildTypes {
--- a/extensions/flac/src/androidTest/AndroidManifest.xml
+++ b/extensions/flac/src/androidTest/AndroidManifest.xml
@ -18,7 +18,7 @@
    xmlns:tools="http://schemas.android.com/tools"
    package="com.google.android.exoplayer2.ext.flac.test">

-  <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="23"/>
+  <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="24"/>

  <application android:debuggable="true"
      android:allowBackup="false"
--- a/extensions/okhttp/build.gradle
+++ b/extensions/okhttp/build.gradle
@ -14,12 +14,12 @@
 apply plugin: 'com.android.library'

 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.1"
+    compileSdkVersion project.ext.compileSdkVersion
+    buildToolsVersion project.ext.buildToolsVersion

    defaultConfig {
        minSdkVersion 9
-        targetSdkVersion 23
+        targetSdkVersion project.ext.targetSdkVersion
    }

    buildTypes {
--- a/extensions/opus/build.gradle
+++ b/extensions/opus/build.gradle
@ -14,12 +14,12 @@
 apply plugin: 'com.android.library'

 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.1"
+    compileSdkVersion project.ext.compileSdkVersion
+    buildToolsVersion project.ext.buildToolsVersion

    defaultConfig {
        minSdkVersion 9
-        targetSdkVersion 23
+        targetSdkVersion project.ext.targetSdkVersion
    }

    buildTypes {
--- a/extensions/opus/src/androidTest/AndroidManifest.xml
+++ b/extensions/opus/src/androidTest/AndroidManifest.xml
@ -18,7 +18,7 @@
    xmlns:tools="http://schemas.android.com/tools"
    package="com.google.android.exoplayer2.ext.opus.test">

-  <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="23"/>
+  <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="24"/>

  <application android:debuggable="true"
      android:allowBackup="false"
--- a/extensions/vp9/build.gradle
+++ b/extensions/vp9/build.gradle
@ -14,12 +14,12 @@
 apply plugin: 'com.android.library'

 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.1"
+    compileSdkVersion project.ext.compileSdkVersion
+    buildToolsVersion project.ext.buildToolsVersion

    defaultConfig {
        minSdkVersion 9
-        targetSdkVersion 23
+        targetSdkVersion project.ext.targetSdkVersion
    }

    buildTypes {
--- a/extensions/vp9/src/androidTest/AndroidManifest.xml
+++ b/extensions/vp9/src/androidTest/AndroidManifest.xml
@ -18,7 +18,7 @@
    xmlns:tools="http://schemas.android.com/tools"
    package="com.google.android.exoplayer2.ext.vp9.test">

-  <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="23"/>
+  <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="24"/>

  <application android:debuggable="true"
      android:allowBackup="false"
--- a/library/build.gradle
+++ b/library/build.gradle
@ -17,8 +17,8 @@ apply plugin: 'com.android.library'
 apply plugin: 'bintray-release'

 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.1"
+    compileSdkVersion project.ext.compileSdkVersion
+    buildToolsVersion project.ext.buildToolsVersion

    defaultConfig {
        // Important: ExoPlayerLib specifies a minSdkVersion of 9 because
@ -27,7 +27,7 @@ android {
        // functionality provided by the library requires API level 16 or
        // greater.
        minSdkVersion 9
-        targetSdkVersion 23
+        targetSdkVersion project.ext.targetSdkVersion
    }

    buildTypes {
--- a/library/src/androidTest/AndroidManifest.xml
+++ b/library/src/androidTest/AndroidManifest.xml
@ -18,7 +18,7 @@
    xmlns:tools="http://schemas.android.com/tools"
    package="com.google.android.exoplayer2.test">

-  <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="23"/>
+  <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="24"/>

  <application android:debuggable="true"
      android:allowBackup="false"
--- a/playbacktests/build.gradle
+++ b/playbacktests/build.gradle
@ -14,13 +14,14 @@
 apply plugin: 'com.android.application'

 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.1"
+    compileSdkVersion project.ext.compileSdkVersion
+    buildToolsVersion project.ext.buildToolsVersion

    defaultConfig {
        minSdkVersion 16
-        targetSdkVersion 23
+        targetSdkVersion project.ext.targetSdkVersion
    }
+
    buildTypes {
        release {
            minifyEnabled false
--- a/playbacktests/src/main/AndroidManifest.xml
+++ b/playbacktests/src/main/AndroidManifest.xml
@ -23,7 +23,7 @@
  <uses-permission android:name="android.permission.INTERNET"/>
  <uses-permission android:name="android.permission.WAKE_LOCK"/>

-  <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="23"/>
+  <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="24"/>

  <application android:debuggable="true"
      android:allowBackup="false"
--- a/testutils/build.gradle
+++ b/testutils/build.gradle
@ -1,15 +1,14 @@
 apply plugin: 'com.android.library'

 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.2"
+    compileSdkVersion project.ext.compileSdkVersion
+    buildToolsVersion project.ext.buildToolsVersion

    defaultConfig {
        minSdkVersion 9
-        targetSdkVersion 23
-        versionCode 1
-        versionName "1.0"
+        targetSdkVersion project.ext.targetSdkVersion
    }
+
    buildTypes {
        release {
            minifyEnabled false