commit 1eff297d6cc33c6a55530c193f87eb5b07da2562
author Chris Banes <chrisbanes@google.com> Thu May 26 10:52:53 2016 +0100
committer Chris Banes <chrisbanes@google.com> Thu May 26 10:52:53 2016 +0100
tree e7e490d6e3da90915834567232682ace53cca450
parent b3a14cb852e554e6c28cb18619bd686f0f318fcb

Fix Android Studio setup for support lib

There seems to be an issue with MediaRouter and
AppCompat with the API moduel setup.

MR depends on AppCompat which contains resources
which need the current SDK. Android Studio can't
handle this and tries to compile AppCompat with the
ApiModule's SDK version which then breaks
(AppCompat can't be compiled against 16, etc).
To work around this, we compile the ApiModules against
current when we're using AS only.

Change-Id: I1a4dbbb95456f40067524de43e522fe6ef704a33

buildSrc/studioCompat.gradle

diff --git a/buildSrc/studioCompat.gradle b/buildSrc/studioCompat.gradle
index 1fca6aa..215685f 100644
--- a/buildSrc/studioCompat.gradle
+++ b/buildSrc/studioCompat.gradle
@@ -25,8 +25,9 @@
  *    * setApiModuleDependencies(project, dependencies, gradle.ext.studioCompat.modules.<PROJECT>.dependencies)
  */
 
+final boolean enableApiModules = hasProperty('android.injected.invoked.from.ide');
+
 def studioCompat = [
-    enableApiModules : hasProperty('android.injected.invoked.from.ide'),
     modules : [
         compat : [
             apiTargets : [
@@ -114,9 +115,14 @@
         ],
         mediaRouter : [
             apiTargets : [
-                new ApiModule("jellybean", 16),
-                new ApiModule("jellybean-mr1", 17),
-                new ApiModule("jellybean-mr2", 18),
+                // MR depends on AppCompat which contains resources which need the current SDK.
+                // Android Studio can't handle this and tries to compile AppCompat with the
+                // ApiModule's SDK version which then breaks (AppCompat can't be compiled
+                // against 16, etc). To work around this, we compile the ApiModules against current
+                // when we're using AS only.
+                new ApiModule("jellybean", enableApiModules ? ApiModule.CURRENT : 16),
+                new ApiModule("jellybean-mr1", enableApiModules ? ApiModule.CURRENT : 17),
+                new ApiModule("jellybean-mr2", enableApiModules ? ApiModule.CURRENT : 18),
                 new ApiModule("api24", ApiModule.CURRENT)
             ],
             dependencies : [':support-appcompat-v7', ':support-palette-v7'],
@@ -136,7 +142,7 @@
         entry.prev = index == 0 ? null : projectConfig.apiTargets[index - 1]
     }
 }
-gradle.ext.currentSdk = studioCompat.enableApiModules ? ApiModule.CURRENT : 'current'
+gradle.ext.currentSdk = enableApiModules ? ApiModule.CURRENT : 'current'
 
 // the hashmap from apiModuleProjectFolder -> ApiModule
 gradle.ext.folderToApiModuleMapping = new HashMap()
@@ -169,7 +175,7 @@
     setupDependencies(v)
 }
 // create these fake modules only if Studio opens the project.
-if (studioCompat.enableApiModules) {
+if (enableApiModules) {
     // validate we have the 99 folder, otherwise it wont work
     def currentSdkPrebuilt = file("${rootProject.projectDir}/../../prebuilts/sdk/" +
             "${ApiModule.CURRENT}/")