diff --git a/demo/build.gradle b/demo/build.gradle index 27180682fa..007dc70590 100644 --- a/demo/build.gradle +++ b/demo/build.gradle @@ -24,24 +24,19 @@ android { buildTypes { release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' + shrinkResources true + minifyEnabled true + proguardFiles getDefaultProguardFile('proguard-android.txt') } debug { jniDebuggable = true - debuggable = true } } - lintOptions { - abortOnError false - } - productFlavors { noExtensions withExtensions } - } dependencies { diff --git a/extensions/cronet/build.gradle b/extensions/cronet/build.gradle index 3c9a36c891..a245133937 100644 --- a/extensions/cronet/build.gradle +++ b/extensions/cronet/build.gradle @@ -23,17 +23,6 @@ android { testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' - } - } - - lintOptions { - abortOnError false - } - sourceSets.main { jniLibs.srcDirs = ['jniLibs'] } diff --git a/extensions/ffmpeg/build.gradle b/extensions/ffmpeg/build.gradle index 579c663fe2..e0f6d900a0 100644 --- a/extensions/ffmpeg/build.gradle +++ b/extensions/ffmpeg/build.gradle @@ -20,17 +20,7 @@ android { defaultConfig { minSdkVersion 9 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 { diff --git a/extensions/ffmpeg/src/main/proguard.cfg b/extensions/ffmpeg/proguard-rules.txt similarity index 100% rename from extensions/ffmpeg/src/main/proguard.cfg rename to extensions/ffmpeg/proguard-rules.txt diff --git a/extensions/flac/build.gradle b/extensions/flac/build.gradle index a40a1adead..7f1a790dad 100644 --- a/extensions/flac/build.gradle +++ b/extensions/flac/build.gradle @@ -20,17 +20,7 @@ android { defaultConfig { minSdkVersion 9 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 { diff --git a/extensions/flac/src/main/proguard.cfg b/extensions/flac/proguard-rules.txt similarity index 100% rename from extensions/flac/src/main/proguard.cfg rename to extensions/flac/proguard-rules.txt diff --git a/extensions/okhttp/build.gradle b/extensions/okhttp/build.gradle index 442f0f78dc..bbf69c60e4 100644 --- a/extensions/okhttp/build.gradle +++ b/extensions/okhttp/build.gradle @@ -22,17 +22,6 @@ android { minSdkVersion 9 targetSdkVersion project.ext.targetSdkVersion } - - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' - } - } - - lintOptions { - abortOnError false - } } dependencies { diff --git a/extensions/opus/build.gradle b/extensions/opus/build.gradle index 3bc06ddaf4..d354654c14 100644 --- a/extensions/opus/build.gradle +++ b/extensions/opus/build.gradle @@ -20,17 +20,7 @@ android { defaultConfig { minSdkVersion 9 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 { diff --git a/extensions/opus/src/main/proguard.cfg b/extensions/opus/proguard-rules.txt similarity index 100% rename from extensions/opus/src/main/proguard.cfg rename to extensions/opus/proguard-rules.txt diff --git a/extensions/vp9/build.gradle b/extensions/vp9/build.gradle index 3bc06ddaf4..d354654c14 100644 --- a/extensions/vp9/build.gradle +++ b/extensions/vp9/build.gradle @@ -20,17 +20,7 @@ android { defaultConfig { minSdkVersion 9 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 { diff --git a/extensions/vp9/src/main/proguard.cfg b/extensions/vp9/proguard-rules.txt similarity index 100% rename from extensions/vp9/src/main/proguard.cfg rename to extensions/vp9/proguard-rules.txt diff --git a/library/build.gradle b/library/build.gradle index 5ec947d0eb..ae2eb2f3d9 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -28,13 +28,10 @@ android { // greater. minSdkVersion 9 targetSdkVersion project.ext.targetSdkVersion + consumerProguardFiles 'proguard-rules.txt' } buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' - } // Re-enable test coverage when the following issue is fixed: // https://code.google.com/p/android/issues/detail?id=226070 // debug { @@ -42,10 +39,6 @@ android { // } } - lintOptions { - abortOnError false - } - sourceSets { androidTest { java.srcDirs += "../testutils/src/main/java/" diff --git a/library/proguard-rules.txt b/library/proguard-rules.txt new file mode 100644 index 0000000000..75f2d095be --- /dev/null +++ b/library/proguard-rules.txt @@ -0,0 +1,7 @@ +# Accessed via reflection in SubtitleDecoderFactory.DEFAULT +-keepclassmembers class com.google.android.exoplayer2.text.cea.Cea608Decoder { + public (java.lang.String, int); +} +-keepclassmembers class com.google.android.exoplayer2.text.cea.Cea708Decoder { + public (int); +} diff --git a/playbacktests/build.gradle b/playbacktests/build.gradle index c099e2c86e..c53793b534 100644 --- a/playbacktests/build.gradle +++ b/playbacktests/build.gradle @@ -21,17 +21,6 @@ android { minSdkVersion 9 targetSdkVersion project.ext.targetSdkVersion } - - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' - } - } - - lintOptions { - abortOnError false - } } dependencies { diff --git a/testutils/build.gradle b/testutils/build.gradle index 61bb50f74d..b935b30c69 100644 --- a/testutils/build.gradle +++ b/testutils/build.gradle @@ -8,13 +8,6 @@ android { minSdkVersion 9 targetSdkVersion project.ext.targetSdkVersion } - - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - } - } } dependencies {