Commit 1eede5d5 by olly Committed by Oliver Woodman

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
parent 264ba8cf
......@@ -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 {
......
......@@ -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']
}
......
......@@ -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 {
......
......@@ -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 {
......
......@@ -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 {
......
......@@ -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 {
......
......@@ -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 {
......
......@@ -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/"
......
# 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);
}
......@@ -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 {
......
......@@ -8,13 +8,6 @@ android {
minSdkVersion 9
targetSdkVersion project.ext.targetSdkVersion
}
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
}
dependencies {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment