Fix Studio setup after v4 split

Change-Id: Id7d694f2271e6fda58ff740db6df755eaa49b0c9
diff --git a/buildSrc/studioCompat.gradle b/buildSrc/studioCompat.gradle
index 140b438..73f406b 100644
--- a/buildSrc/studioCompat.gradle
+++ b/buildSrc/studioCompat.gradle
@@ -28,7 +28,7 @@
 def studioCompat = [
     enableApiModules : hasProperty('android.injected.invoked.from.ide'),
     modules : [
-        v4 : [
+        compat : [
             apiTargets : [
                 new ApiModule("donut",4),
                 new ApiModule("eclair",5),
@@ -44,15 +44,35 @@
                 new ApiModule("jellybean-mr1",17),
                 new ApiModule("jellybean-mr2",18),
                 new ApiModule("kitkat",19),
-                new ApiModule("api20",20),
                 new ApiModule("api21",21),
                 new ApiModule("api22",22),
                 new ApiModule("api23",23),
                 new ApiModule("api24", ApiModule.CURRENT)
             ],
             dependencies : [":support-annotations"],
+            folder : "compat",
+            moduleName : "support-compat"
+        ],
+        core : [
+            apiTargets : [
+                new ApiModule("donut",4),
+                new ApiModule("eclair",5),
+                new ApiModule("froyo",8),
+                new ApiModule("gingerbread",9),
+                new ApiModule("honeycomb",11),
+                new ApiModule("ics",14),
+                new ApiModule("jellybean", 16),
+                new ApiModule("jellybean-mr2",18),
+                new ApiModule("kitkat",19),
+                new ApiModule("api20",20),
+                new ApiModule("api21",21),
+                new ApiModule("api22",22),
+                new ApiModule("api23",23),
+                new ApiModule("api24", ApiModule.CURRENT)
+            ],
+            dependencies : [":support-compat"],
             folder : "v4",
-            moduleName : "support-v4"
+            moduleName : "support-core"
         ],
         v13 : [
             apiTargets : [
@@ -154,4 +174,4 @@
     }
 }
 gradle.ext.studioCompat = studioCompat
-gradle.ext.getApiModule = this.&getApiModule
\ No newline at end of file
+gradle.ext.getApiModule = this.&getApiModule
diff --git a/compat/build.gradle b/compat/build.gradle
index 36edc8d..b41afc7 100644
--- a/compat/build.gradle
+++ b/compat/build.gradle
@@ -2,7 +2,7 @@
 archivesBaseName = 'support-compat'
 
 
-createApiSourceSets(project, gradle.ext.studioCompat.modules.v4.apiTargets)
+createApiSourceSets(project, gradle.ext.studioCompat.modules.compat.apiTargets)
 dependencies {
     androidTestCompile ('com.android.support.test:runner:0.4.1') {
         exclude module: 'support-annotations'
@@ -18,7 +18,7 @@
 
 sourceCompatibility = JavaVersion.VERSION_1_7
 targetCompatibility = JavaVersion.VERSION_1_7
-setApiModuleDependencies(project, dependencies, gradle.ext.studioCompat.modules.v4.dependencies)
+setApiModuleDependencies(project, dependencies, gradle.ext.studioCompat.modules.compat.dependencies)
 
 android {
     compileSdkVersion 4
diff --git a/v4/build.gradle b/v4/build.gradle
index 6b63ba4..24d92c8 100644
--- a/v4/build.gradle
+++ b/v4/build.gradle
@@ -2,7 +2,7 @@
 archivesBaseName = 'support-core'
 
 
-createApiSourceSets(project, gradle.ext.studioCompat.modules.v4.apiTargets)
+createApiSourceSets(project, gradle.ext.studioCompat.modules.core.apiTargets)
 dependencies {
     compile project(':support-compat')
     androidTestCompile ('com.android.support.test:runner:0.4.1') {
@@ -19,7 +19,7 @@
 
 sourceCompatibility = JavaVersion.VERSION_1_7
 targetCompatibility = JavaVersion.VERSION_1_7
-setApiModuleDependencies(project, dependencies, gradle.ext.studioCompat.modules.v4.dependencies)
+setApiModuleDependencies(project, dependencies, gradle.ext.studioCompat.modules.core.dependencies)
 
 android {
     compileSdkVersion 4