diff --git a/demo/build.gradle b/demo/build.gradle
index 2c01cbbe73..27180682fa 100644
--- a/demo/build.gradle
+++ b/demo/build.gradle
@@ -37,23 +37,17 @@ android {
         abortOnError false
     }
 
-    flavorDimensions "extensions"
-
     productFlavors {
-        noExtns {
-            dimension "extensions"
-        }
-        extns {
-            dimension "extensions"
-        }
+        noExtensions
+        withExtensions
     }
 
 }
 
 dependencies {
     compile project(':library')
-    extnsCompile project(path: ':extension-ffmpeg')
-    extnsCompile project(path: ':extension-flac')
-    extnsCompile project(path: ':extension-opus')
-    extnsCompile project(path: ':extension-vp9')
+    withExtensionsCompile project(path: ':extension-ffmpeg')
+    withExtensionsCompile project(path: ':extension-flac')
+    withExtensionsCompile project(path: ':extension-opus')
+    withExtensionsCompile project(path: ':extension-vp9')
 }
diff --git a/demo/src/main/java/com/google/android/exoplayer2/demo/DemoApplication.java b/demo/src/main/java/com/google/android/exoplayer2/demo/DemoApplication.java
index a7e67d169a..b5db4c018d 100644
--- a/demo/src/main/java/com/google/android/exoplayer2/demo/DemoApplication.java
+++ b/demo/src/main/java/com/google/android/exoplayer2/demo/DemoApplication.java
@@ -46,9 +46,7 @@ public class DemoApplication extends Application {
   }
 
   public boolean useExtensionRenderers() {
-    // We should return BuildConfig.FLAVOR_extensions.equals("extns") here, but this is currently
-    // incompatible with a Google internal build system.
-    return true;
+    return BuildConfig.FLAVOR.equals("withExtensions");
   }
 
 }