diff options
| author | Tor Norbye <tnorbye@google.com> | 2013-11-04 12:54:53 -0800 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2013-11-04 12:54:53 -0800 |
| commit | 3791a7d01e17f86fd5f293fff349aebd12a05123 (patch) | |
| tree | 2e6f7d085c48656782c100285d5852df41831239 /build/scripts | |
| parent | 979193a8ed98d8c4fb21acedb4f9876099587c26 (diff) | |
| parent | 3a2425a5aed1bef93dab954745ad5665265eb70b (diff) | |
| download | idea-3791a7d01e17f86fd5f293fff349aebd12a05123.tar.gz | |
Merge remote-tracking branch 'aosp/snapshot-master' into merge
Conflicts:
.idea/modules.xml
build/scripts/dist.gant
Change-Id: I5a8e8ea4b74cec6ae1f9725c0ec7e4144a0a7d77
Diffstat (limited to 'build/scripts')
| -rw-r--r-- | build/scripts/dist.gant | 3 | ||||
| -rw-r--r-- | build/scripts/layouts.gant | 2 | ||||
| -rw-r--r-- | build/scripts/utils.gant | 2 |
3 files changed, 7 insertions, 0 deletions
diff --git a/build/scripts/dist.gant b/build/scripts/dist.gant index 3c2adf4454ae..ff3686aec713 100644 --- a/build/scripts/dist.gant +++ b/build/scripts/dist.gant @@ -143,6 +143,9 @@ def layoutAll(Map args, String home, String out, Paths _paths = null, buildJps = def linTarRoot = "android-studio" androidBuildNumber = p("buildNumber") + //def macAppRoot = isEap() ? + // "IntelliJ IDEA ${p("component.version.major")} CE EAP.app" : + // "IntelliJ IDEA ${p("component.version.major")} CE.app" def winZip = "$paths.artifacts/android-studio-${androidBuildNumber}.win.zip" def macZip = "$paths.artifacts/android-studio-${androidBuildNumber}.mac.zip" diff --git a/build/scripts/layouts.gant b/build/scripts/layouts.gant index fbc6040dd9cd..9331046977f3 100644 --- a/build/scripts/layouts.gant +++ b/build/scripts/layouts.gant @@ -68,6 +68,7 @@ def layoutFull(String home, String targetDirectory, String patchedDescriptorDir "remote-servers-api", "remote-servers-java-api", "testFramework-java", + "xml-analysis-api", ].flatten() //noinspection GroovyAssignabilityCheck @@ -90,6 +91,7 @@ def layoutFull(String home, String targetDirectory, String patchedDescriptorDir "remote-servers-java-impl", "testFramework", "tests_bootstrap", + "xml-analysis-impl", ].flatten() ant.patternset(id: "resources.included") { diff --git a/build/scripts/utils.gant b/build/scripts/utils.gant index d7f102a70174..d2bdeae6ea31 100644 --- a/build/scripts/utils.gant +++ b/build/scripts/utils.gant @@ -263,6 +263,7 @@ binding.setVariable("platformApiModules", [ "vcs-api", "vcs-log-api", "xdebugger-api", + "xml-analysis-api", "xml-openapi", "xml-psi-api", ]) @@ -291,6 +292,7 @@ binding.setVariable("platformImplementationModules", [ "spellchecker", "xdebugger-impl", "xml", + "xml-analysis-impl", "xml-psi-impl", ]) |