diff options
| author | Alex Ruiz <alruiz@google.com> | 2014-06-06 15:17:44 -0700 |
|---|---|---|
| committer | Alex Ruiz <alruiz@google.com> | 2014-06-06 16:48:51 -0700 |
| commit | 9db48bc85f10d11a4beda7ce6ad624a576379da4 (patch) | |
| tree | 0b155e5a4c4f0da1165d63dbc63189244f45b96f /android-gradle-jps | |
| parent | 98e6556c5142ccbfe5de0171831a68eaea9921a7 (diff) | |
| download | idea-9db48bc85f10d11a4beda7ce6ad624a576379da4.tar.gz | |
When invoking Gradle, we pass parameters as project properties.
This way we ensure we don't create new Gradle daemons.
This CL depends on:
https://android-review.googlesource.com/97034
https://android-review.googlesource.com/97043
Change-Id: Ifd6595c185260c814b2a07713219395e33eb2447
Diffstat (limited to 'android-gradle-jps')
| -rw-r--r-- | android-gradle-jps/src/com/android/tools/idea/jps/builder/AndroidGradleTargetBuilder.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/android-gradle-jps/src/com/android/tools/idea/jps/builder/AndroidGradleTargetBuilder.java b/android-gradle-jps/src/com/android/tools/idea/jps/builder/AndroidGradleTargetBuilder.java index b8a1b8d621d..a857fda0f13 100644 --- a/android-gradle-jps/src/com/android/tools/idea/jps/builder/AndroidGradleTargetBuilder.java +++ b/android-gradle-jps/src/com/android/tools/idea/jps/builder/AndroidGradleTargetBuilder.java @@ -306,8 +306,6 @@ public class AndroidGradleTargetBuilder extends TargetBuilder<AndroidGradleBuild jvmArgs.add(arg); } - jvmArgs.add(AndroidGradleSettings.createJvmArg(AndroidProject.INVOKED_FROM_IDE_PROPERTY, true)); - if (androidHome != null && !androidHome.isEmpty()) { String androidSdkArg = AndroidGradleSettings.createAndroidHomeJvmArg(androidHome); jvmArgs.add(androidSdkArg); @@ -322,6 +320,7 @@ public class AndroidGradleTargetBuilder extends TargetBuilder<AndroidGradleBuild List<String> commandLineArgs = Lists.newArrayList(); commandLineArgs.addAll(executionSettings.getCommandLineOptions()); + commandLineArgs.add(AndroidGradleSettings.createProjectProperty(AndroidProject.INVOKED_FROM_IDE_PROPERTY, true)); if (executionSettings.isParallelBuild() && !commandLineArgs.contains(PARALLEL_BUILD_OPTION)) { commandLineArgs.add(PARALLEL_BUILD_OPTION); |