Merge remote-tracking branch 'aosp/upstream-master' into merge

Conflicts:
	.idea/modules.xml

Change-Id: I1c543bf1780b54245d29d8e2e90a1717ba3d1766

3 files changed, 11 insertions, 7 deletions

diff --git a/build/conf/mac/Contents/Info.plist b/build/conf/mac/Contents/Info.plist
index 1ed2e6166b97..eb5a13153c05 100644
--- a/build/conf/mac/Contents/Info.plist
+++ b/build/conf/mac/Contents/Info.plist
@@ -57,7 +57,11 @@
     @@archs@@
     <key>LSRequiresNativeExecution</key>
     <string>YES</string>
+    <key>LSMinimumSystemVersion</key>
+    <string>@@min_osx@@</string>
+
     @@url_schemes@@
+
     <key>JVMOptions</key>
     <dict>
       <key>ClassPath</key>
diff --git a/build/scripts/layouts.gant b/build/scripts/layouts.gant
index ebe92f90bd69..e59742577a6f 100644
--- a/build/scripts/layouts.gant
+++ b/build/scripts/layouts.gant
@@ -345,14 +345,13 @@ public def layoutCommunityPlugins(String home) {
       jar("gradle.jar") {
         module("gradle")
       }
-      jar("gradle-tooling-extension.jar") {
-        module("gradle-tooling-extension")
+
+      jar("gradle-tooling-extension-api.jar") {
+        module("gradle-tooling-extension-api")
       }
-      def gradleToolingVersions = ["1.9", "1.11", "1.12"]
-      gradleToolingVersions.each { ver ->
-        jar("gradle-tooling-extension-v" + ver + ".jar") {
-          module("gradle-tooling-extension-v" + ver)
-        }
+
+      jar("gradle-tooling-extension-impl.jar") {
+        module("gradle-tooling-extension-impl")
       }
       fileset(dir: "$home/plugins/gradle/lib") { include(name: "*.jar") }
     }
diff --git a/build/scripts/utils.gant b/build/scripts/utils.gant
index 9f5d46832bfc..81be1b7daf54 100644
--- a/build/scripts/utils.gant
+++ b/build/scripts/utils.gant
@@ -411,6 +411,7 @@ binding.setVariable("layoutMacApp", { String path, String ch, Map args ->
     replacefilter(token: "@@help_id@@", value: helpId)
     replacefilter(token: "@@url_schemes@@", value: urlSchemes)
     replacefilter(token: "@@archs@@", value: archs)
+    replacefilter(token: "@@min_osx@@", value: ifNull(args.min_osx, "10.6"))
   }
 
   if (executable != "idea") {