diff options
| author | Tor Norbye <tnorbye@google.com> | 2015-02-05 10:51:23 -0800 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2015-02-05 10:51:23 -0800 |
| commit | 8b019590127123ad52a7bd7ebb603b69163b0619 (patch) | |
| tree | 8cdc36aaef879ad184522e72273ee30ae14f29a3 /android-gradle-jps | |
| parent | 2bb9bd6b1e1871684accf99f59635358e9b307b4 (diff) | |
| parent | 00b37ea8b3aaecd9246ac8b160bbc7a9c65de813 (diff) | |
| download | idea-8b019590127123ad52a7bd7ebb603b69163b0619.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-idea14' into merge-upstream
Conflicts:
adt-branding/src/idea/AndroidStudioApplicationInfo.xml
android/guiTestSrc/com/android/tools/idea/tests/gui/framework/fixture/ExecutionToolWindowFixture.java
android/resources/messages/AndroidBundle.properties
android/src/META-INF/plugin.xml
android/src/com/android/tools/idea/avdmanager/AvdEditWizard.java
android/src/com/android/tools/idea/avdmanager/AvdWizardConstants.java
android/src/com/android/tools/idea/configurations/LocaleMenuAction.java
android/src/com/android/tools/idea/gradle/project/PostProjectSetupTasksExecutor.java
android/src/com/android/tools/idea/gradle/variant/view/BuildVariantView.java
android/src/com/android/tools/idea/lang/proguard/ProguardFileTypeFactory.java
android/src/com/android/tools/idea/sdk/DefaultSdks.java
android/src/com/android/tools/idea/templates/Template.java
android/src/com/android/tools/idea/wizard/NewAndroidModulePath.java
android/src/org/jetbrains/android/actions/RunAndroidAvdManagerAction.java
android/src/org/jetbrains/android/sdk/AndroidSdkUtils.java
android/testSrc/com/android/tools/idea/welcome/AndroidVirtualDeviceTest.java
Change-Id: I9825f81c2fe13f44c3f4571c33c1a2eb29703f18
Diffstat (limited to 'android-gradle-jps')
| -rw-r--r-- | android-gradle-jps/src/com/android/tools/idea/jps/builder/AndroidGradleBuilderService.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/android-gradle-jps/src/com/android/tools/idea/jps/builder/AndroidGradleBuilderService.java b/android-gradle-jps/src/com/android/tools/idea/jps/builder/AndroidGradleBuilderService.java index 1170fbf70be..e760c4a3580 100644 --- a/android-gradle-jps/src/com/android/tools/idea/jps/builder/AndroidGradleBuilderService.java +++ b/android-gradle-jps/src/com/android/tools/idea/jps/builder/AndroidGradleBuilderService.java @@ -30,13 +30,14 @@ import java.util.List; public class AndroidGradleBuilderService extends BuilderService { @Override @NotNull - public List<? extends ModuleLevelBuilder> createModuleLevelBuilders() { - return Collections.singletonList(new AndroidGradleBuilder()); + public List<? extends BuildTargetType<?>> getTargetTypes() { + return Collections.singletonList(AndroidGradleBuildTarget.TargetType.INSTANCE); } @Override - public List<? extends BuildTargetType<?>> getTargetTypes() { - return Collections.singletonList(AndroidGradleBuildTarget.TargetType.INSTANCE); + @NotNull + public List<? extends ModuleLevelBuilder> createModuleLevelBuilders() { + return Collections.singletonList(new AndroidGradleBuilder()); } @Override |