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
This commit is contained in:
olly 2017-01-12 11:38:42 -08:00 committed by Oliver Woodman
parent 264ba8cfcf
commit 1eede5d5bb
15 changed files with 15 additions and 100 deletions

View file

@ -24,24 +24,19 @@ android {
buildTypes { buildTypes {
release { release {
minifyEnabled false shrinkResources true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' 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 {

View file

@ -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']
} }

View file

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

View file

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

View file

@ -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 {

View file

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

View file

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

View file

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

View file

@ -0,0 +1,7 @@
# 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);
}

View file

@ -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 {

View file

@ -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 {