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

demo/build.gradle

@@ -14,13 +14,14 @@
 apply plugin: 'com.android.application'
 apply plugin: 'com.android.application'
 
 
 android {
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.1"
+    compileSdkVersion project.ext.compileSdkVersion
+    buildToolsVersion project.ext.buildToolsVersion
 
 
     defaultConfig {
     defaultConfig {
         minSdkVersion 16
         minSdkVersion 16
-        targetSdkVersion 23
+        targetSdkVersion project.ext.targetSdkVersion
     }
     }
+
     buildTypes {
     buildTypes {
         release {
         release {
             minifyEnabled false
             minifyEnabled false

demo/src/main/AndroidManifest.xml

@@ -17,13 +17,12 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.google.android.exoplayer2.demo"
     package="com.google.android.exoplayer2.demo"
     android:versionCode="2000"
     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.INTERNET"/>
   <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
   <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
   <application
       android:label="@string/application_name"
       android:label="@string/application_name"

demo/src/main/java/com/google/android/exoplayer2/demo/SampleChooserActivity.java

@@ -303,8 +303,8 @@ public class SampleChooserActivity extends Activity {
         ViewGroup parent) {
         ViewGroup parent) {
       View view = convertView;
       View view = convertView;
       if (view == null) {
       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);
       ((TextView) view).setText(getGroup(groupPosition).title);
       return view;
       return view;

demo/src/main/res/layout/player_activity.xml

@@ -68,8 +68,7 @@
           android:layout_width="wrap_content"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:layout_height="wrap_content"
           android:text="@string/retry"
           android:text="@string/retry"
-          android:visibility="gone"
-          style="@style/DemoButton"/>
+          android:visibility="gone"/>
 
 
     </LinearLayout>
     </LinearLayout>
 
 

demo/src/main/res/layout/sample_chooser_inline_header.xml

-<?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"/>

demo/src/main/res/values/styles.xml

@@ -16,18 +16,9 @@
 
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 <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:windowNoTitle">true</item>
     <item name="android:windowBackground">@android:color/black</item>
     <item name="android:windowBackground">@android:color/black</item>
   </style>
   </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>
 </resources>

extensions/cronet/build.gradle

@@ -14,12 +14,12 @@
 apply plugin: 'com.android.library'
 apply plugin: 'com.android.library'
 
 
 android {
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.1"
+    compileSdkVersion project.ext.compileSdkVersion
+    buildToolsVersion project.ext.buildToolsVersion
 
 
     defaultConfig {
     defaultConfig {
         minSdkVersion 9
         minSdkVersion 9
-        targetSdkVersion 23
+        targetSdkVersion project.ext.targetSdkVersion
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     }
 
 

extensions/cronet/src/androidTest/AndroidManifest.xml

@@ -18,7 +18,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.google.android.exoplayer.ext.cronet">
     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"
   <application android:debuggable="true"
       android:allowBackup="false"
       android:allowBackup="false"

extensions/cronet/src/main/AndroidManifest.xml

@@ -18,6 +18,4 @@
 
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
 
 
-    <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="23"/>
-
 </manifest>
 </manifest>

extensions/ffmpeg/build.gradle

@@ -14,12 +14,12 @@
 apply plugin: 'com.android.library'
 apply plugin: 'com.android.library'
 
 
 android {
 android {
-    compileSdkVersion 23
-    buildToolsVersion '23.0.1'
+    compileSdkVersion project.ext.compileSdkVersion
+    buildToolsVersion project.ext.buildToolsVersion
 
 
     defaultConfig {
     defaultConfig {
         minSdkVersion 9
         minSdkVersion 9
-        targetSdkVersion 23
+        targetSdkVersion project.ext.targetSdkVersion
     }
     }
 
 
     buildTypes {
     buildTypes {

extensions/flac/build.gradle

@@ -14,12 +14,12 @@
 apply plugin: 'com.android.library'
 apply plugin: 'com.android.library'
 
 
 android {
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.1"
+    compileSdkVersion project.ext.compileSdkVersion
+    buildToolsVersion project.ext.buildToolsVersion
 
 
     defaultConfig {
     defaultConfig {
         minSdkVersion 9
         minSdkVersion 9
-        targetSdkVersion 23
+        targetSdkVersion project.ext.targetSdkVersion
     }
     }
 
 
     buildTypes {
     buildTypes {

extensions/flac/src/androidTest/AndroidManifest.xml

@@ -18,7 +18,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.google.android.exoplayer2.ext.flac.test">
     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"
   <application android:debuggable="true"
       android:allowBackup="false"
       android:allowBackup="false"

extensions/okhttp/build.gradle

@@ -14,12 +14,12 @@
 apply plugin: 'com.android.library'
 apply plugin: 'com.android.library'
 
 
 android {
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.1"
+    compileSdkVersion project.ext.compileSdkVersion
+    buildToolsVersion project.ext.buildToolsVersion
 
 
     defaultConfig {
     defaultConfig {
         minSdkVersion 9
         minSdkVersion 9
-        targetSdkVersion 23
+        targetSdkVersion project.ext.targetSdkVersion
     }
     }
 
 
     buildTypes {
     buildTypes {

extensions/opus/build.gradle

@@ -14,12 +14,12 @@
 apply plugin: 'com.android.library'
 apply plugin: 'com.android.library'
 
 
 android {
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.1"
+    compileSdkVersion project.ext.compileSdkVersion
+    buildToolsVersion project.ext.buildToolsVersion
 
 
     defaultConfig {
     defaultConfig {
         minSdkVersion 9
         minSdkVersion 9
-        targetSdkVersion 23
+        targetSdkVersion project.ext.targetSdkVersion
     }
     }
 
 
     buildTypes {
     buildTypes {

extensions/opus/src/androidTest/AndroidManifest.xml

@@ -18,7 +18,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.google.android.exoplayer2.ext.opus.test">
     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"
   <application android:debuggable="true"
       android:allowBackup="false"
       android:allowBackup="false"

extensions/vp9/build.gradle

@@ -14,12 +14,12 @@
 apply plugin: 'com.android.library'
 apply plugin: 'com.android.library'
 
 
 android {
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.1"
+    compileSdkVersion project.ext.compileSdkVersion
+    buildToolsVersion project.ext.buildToolsVersion
 
 
     defaultConfig {
     defaultConfig {
         minSdkVersion 9
         minSdkVersion 9
-        targetSdkVersion 23
+        targetSdkVersion project.ext.targetSdkVersion
     }
     }
 
 
     buildTypes {
     buildTypes {

extensions/vp9/src/androidTest/AndroidManifest.xml

@@ -18,7 +18,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.google.android.exoplayer2.ext.vp9.test">
     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"
   <application android:debuggable="true"
       android:allowBackup="false"
       android:allowBackup="false"

library/build.gradle

@@ -17,8 +17,8 @@ apply plugin: 'com.android.library'
 apply plugin: 'bintray-release'
 apply plugin: 'bintray-release'
 
 
 android {
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.1"
+    compileSdkVersion project.ext.compileSdkVersion
+    buildToolsVersion project.ext.buildToolsVersion
 
 
     defaultConfig {
     defaultConfig {
         // Important: ExoPlayerLib specifies a minSdkVersion of 9 because
         // Important: ExoPlayerLib specifies a minSdkVersion of 9 because
@@ -27,7 +27,7 @@ android {
         // functionality provided by the library requires API level 16 or
         // functionality provided by the library requires API level 16 or
         // greater.
         // greater.
         minSdkVersion 9
         minSdkVersion 9
-        targetSdkVersion 23
+        targetSdkVersion project.ext.targetSdkVersion
     }
     }
 
 
     buildTypes {
     buildTypes {

library/src/androidTest/AndroidManifest.xml

@@ -18,7 +18,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.google.android.exoplayer2.test">
     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"
   <application android:debuggable="true"
       android:allowBackup="false"
       android:allowBackup="false"

playbacktests/build.gradle

@@ -14,13 +14,14 @@
 apply plugin: 'com.android.application'
 apply plugin: 'com.android.application'
 
 
 android {
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.1"
+    compileSdkVersion project.ext.compileSdkVersion
+    buildToolsVersion project.ext.buildToolsVersion
 
 
     defaultConfig {
     defaultConfig {
         minSdkVersion 16
         minSdkVersion 16
-        targetSdkVersion 23
+        targetSdkVersion project.ext.targetSdkVersion
     }
     }
+
     buildTypes {
     buildTypes {
         release {
         release {
             minifyEnabled false
             minifyEnabled false

playbacktests/src/main/AndroidManifest.xml

@@ -23,7 +23,7 @@
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-permission android:name="android.permission.WAKE_LOCK"/>
   <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"
   <application android:debuggable="true"
       android:allowBackup="false"
       android:allowBackup="false"

testutils/build.gradle

 apply plugin: 'com.android.library'
 apply plugin: 'com.android.library'
 
 
 android {
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.2"
+    compileSdkVersion project.ext.compileSdkVersion
+    buildToolsVersion project.ext.buildToolsVersion
 
 
     defaultConfig {
     defaultConfig {
         minSdkVersion 9
         minSdkVersion 9
-        targetSdkVersion 23
-        versionCode 1
-        versionName "1.0"
+        targetSdkVersion project.ext.targetSdkVersion
     }
     }
+
     buildTypes {
     buildTypes {
         release {
         release {
             minifyEnabled false
             minifyEnabled false