Fix gradle/proguard setup

- Add proguard rules for libraries/extensions into .aar files
- Add proguard rules to retain CEA608/708 decoder constructors
- Remove lots of default config from gradle files
- Remove disabling of abort on lint error
- Enable optimizations on release builds of demo app

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=144350233

demo/build.gradle

@@ -24,24 +24,19 @@ android {
 
 
     buildTypes {
     buildTypes {
         release {
         release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
+            shrinkResources true
+            minifyEnabled true
+            proguardFiles getDefaultProguardFile('proguard-android.txt')
         }
         }
         debug {
         debug {
             jniDebuggable = true
             jniDebuggable = true
-            debuggable = true
         }
         }
     }
     }
 
 
-    lintOptions {
-        abortOnError false
-    }
-
     productFlavors {
     productFlavors {
         noExtensions
         noExtensions
         withExtensions
         withExtensions
     }
     }
-
 }
 }
 
 
 dependencies {
 dependencies {

extensions/cronet/build.gradle

@@ -23,17 +23,6 @@ android {
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     }
 
 
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
-        }
-    }
-
-    lintOptions {
-        abortOnError false
-    }
-
     sourceSets.main {
     sourceSets.main {
         jniLibs.srcDirs = ['jniLibs']
         jniLibs.srcDirs = ['jniLibs']
     }
     }

extensions/ffmpeg/build.gradle

@@ -20,17 +20,7 @@ android {
     defaultConfig {
     defaultConfig {
         minSdkVersion 9
         minSdkVersion 9
         targetSdkVersion project.ext.targetSdkVersion
         targetSdkVersion project.ext.targetSdkVersion
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
-        }
-    }
-
-    lintOptions {
-        abortOnError false
+        consumerProguardFiles 'proguard-rules.txt'
     }
     }
 
 
     sourceSets.main {
     sourceSets.main {

extensions/flac/build.gradle

@@ -20,17 +20,7 @@ android {
     defaultConfig {
     defaultConfig {
         minSdkVersion 9
         minSdkVersion 9
         targetSdkVersion project.ext.targetSdkVersion
         targetSdkVersion project.ext.targetSdkVersion
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
-        }
-    }
-
-    lintOptions {
-        abortOnError false
+        consumerProguardFiles 'proguard-rules.txt'
     }
     }
 
 
     sourceSets.main {
     sourceSets.main {

extensions/okhttp/build.gradle

@@ -22,17 +22,6 @@ android {
         minSdkVersion 9
         minSdkVersion 9
         targetSdkVersion project.ext.targetSdkVersion
         targetSdkVersion project.ext.targetSdkVersion
     }
     }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
-        }
-    }
-
-    lintOptions {
-        abortOnError false
-    }
 }
 }
 
 
 dependencies {
 dependencies {

extensions/opus/build.gradle

@@ -20,17 +20,7 @@ android {
     defaultConfig {
     defaultConfig {
         minSdkVersion 9
         minSdkVersion 9
         targetSdkVersion project.ext.targetSdkVersion
         targetSdkVersion project.ext.targetSdkVersion
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
-        }
-    }
-
-    lintOptions {
-        abortOnError false
+        consumerProguardFiles 'proguard-rules.txt'
     }
     }
 
 
     sourceSets.main {
     sourceSets.main {

extensions/vp9/build.gradle

@@ -20,17 +20,7 @@ android {
     defaultConfig {
     defaultConfig {
         minSdkVersion 9
         minSdkVersion 9
         targetSdkVersion project.ext.targetSdkVersion
         targetSdkVersion project.ext.targetSdkVersion
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
-        }
-    }
-
-    lintOptions {
-        abortOnError false
+        consumerProguardFiles 'proguard-rules.txt'
     }
     }
 
 
     sourceSets.main {
     sourceSets.main {

library/build.gradle

@@ -28,13 +28,10 @@ android {
         // greater.
         // greater.
         minSdkVersion 9
         minSdkVersion 9
         targetSdkVersion project.ext.targetSdkVersion
         targetSdkVersion project.ext.targetSdkVersion
+        consumerProguardFiles 'proguard-rules.txt'
     }
     }
 
 
     buildTypes {
     buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
-        }
         // Re-enable test coverage when the following issue is fixed:
         // Re-enable test coverage when the following issue is fixed:
         // https://code.google.com/p/android/issues/detail?id=226070
         // https://code.google.com/p/android/issues/detail?id=226070
         // debug {
         // debug {
@@ -42,10 +39,6 @@ android {
         // }
         // }
     }
     }
 
 
-    lintOptions {
-        abortOnError false
-    }
-
     sourceSets {
     sourceSets {
         androidTest {
         androidTest {
             java.srcDirs += "../testutils/src/main/java/"
             java.srcDirs += "../testutils/src/main/java/"

library/proguard-rules.txt

+# Accessed via reflection in SubtitleDecoderFactory.DEFAULT
+-keepclassmembers class com.google.android.exoplayer2.text.cea.Cea608Decoder {
+    public <init>(java.lang.String, int);
+}
+-keepclassmembers class com.google.android.exoplayer2.text.cea.Cea708Decoder {
+    public <init>(int);
+}

playbacktests/build.gradle

@@ -21,17 +21,6 @@ android {
         minSdkVersion 9
         minSdkVersion 9
         targetSdkVersion project.ext.targetSdkVersion
         targetSdkVersion project.ext.targetSdkVersion
     }
     }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
-        }
-    }
-
-    lintOptions {
-        abortOnError false
-    }
 }
 }
 
 
 dependencies {
 dependencies {

testutils/build.gradle

@@ -8,13 +8,6 @@ android {
         minSdkVersion 9
         minSdkVersion 9
         targetSdkVersion project.ext.targetSdkVersion
         targetSdkVersion project.ext.targetSdkVersion
     }
     }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
 }
 }
 
 
 dependencies {
 dependencies {