Fix BuildConfig generation for internal builds

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=140210128
This commit is contained in:
olly 2016-11-25 10:43:02 -08:00 committed by Oliver Woodman
parent c3c176d93c
commit e56cf49038
2 changed files with 7 additions and 15 deletions

View file

@ -37,23 +37,17 @@ android {
abortOnError false abortOnError false
} }
flavorDimensions "extensions"
productFlavors { productFlavors {
noExtns { noExtensions
dimension "extensions" withExtensions
}
extns {
dimension "extensions"
}
} }
} }
dependencies { dependencies {
compile project(':library') compile project(':library')
extnsCompile project(path: ':extension-ffmpeg') withExtensionsCompile project(path: ':extension-ffmpeg')
extnsCompile project(path: ':extension-flac') withExtensionsCompile project(path: ':extension-flac')
extnsCompile project(path: ':extension-opus') withExtensionsCompile project(path: ':extension-opus')
extnsCompile project(path: ':extension-vp9') withExtensionsCompile project(path: ':extension-vp9')
} }

View file

@ -46,9 +46,7 @@ public class DemoApplication extends Application {
} }
public boolean useExtensionRenderers() { public boolean useExtensionRenderers() {
// We should return BuildConfig.FLAVOR_extensions.equals("extns") here, but this is currently return BuildConfig.FLAVOR.equals("withExtensions");
// incompatible with a Google internal build system.
return true;
} }
} }