diff options
| author | Joe Baker-Malone <jbakermalone@google.com> | 2015-07-07 21:07:33 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-07 21:07:33 +0000 |
| commit | 24dd4cd7d7c527651d1632c2eb08b433bfa34c45 (patch) | |
| tree | 872272e7801edd4ca74c46f56185e58bcac879a4 | |
| parent | bffde0a6d2a1fb2969ef85850d53be124a98d064 (diff) | |
| parent | b0344cf0ff5f5a29049b20cbdc49664c159ab4d9 (diff) | |
| download | platform_sdk-24dd4cd7d7c527651d1632c2eb08b433bfa34c45.tar.gz platform_sdk-24dd4cd7d7c527651d1632c2eb08b433bfa34c45.tar.bz2 platform_sdk-24dd4cd7d7c527651d1632c2eb08b433bfa34c45.zip | |
am b0344cf0: Merge "Supporting path specified by build_tools.sh" into studio-1.4-dev automerge: 6664a90 automerge: 5ffab62
* commit 'b0344cf0ff5f5a29049b20cbdc49664c159ab4d9':
Supporting path specified by build_tools.sh
| -rw-r--r-- | eclipse/build.gradle | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/eclipse/build.gradle b/eclipse/build.gradle index c483ce7ab..c5639304f 100644 --- a/eclipse/build.gradle +++ b/eclipse/build.gradle @@ -8,9 +8,16 @@ // get tools/base version apply from: "../../tools/buildSrc/base/version.gradle" +ext.outPath = System.env.OUT_DIR +ext.outFile = new File(outPath) +if (outPath == null) { + outPath = '../../out' + outFile = new File(projectDir, outPath) +} + repositories { maven { url '../../prebuilts/tools/common/m2/repository' } - maven { url '../../out/repo' } + maven { url outPath + '/repo' } } ext { @@ -132,7 +139,7 @@ task copydeps << { // unzip eclipse prebuilts into the out folder to create a target platform for the build task unzipTargetPlatform << { - File targetDir = new File(projectDir, "../../out/host/maven/target").getCanonicalFile() + File targetDir = new File(outFile, "/host/maven/target").getCanonicalFile() targetDir.mkdirs() project.targetComponents.each { String k, File v -> @@ -144,7 +151,7 @@ task unzipTargetPlatform << { task buildEclipse(type: Exec, dependsOn: unzipTargetPlatform) { def maven = new File(projectDir, "../../prebuilts/eclipse/maven/apache-maven-3.2.1/bin/mvn").getCanonicalFile() - def androidOut = new File(projectDir, "../../out").getCanonicalPath() + def androidOut = outFile.getCanonicalPath() environment("M2_HOME", maven.getParentFile().getParentFile().getCanonicalPath()) workingDir projectDir commandLine maven.getCanonicalPath(), "-s", "settings.xml", "-DforceContextQualifier=$project.buildNumber", "-DANDROID_OUT=$androidOut", "package" |