diff options
| author | Xavier Ducrohet <xav@android.com> | 2015-03-20 22:16:55 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-20 22:16:55 +0000 |
| commit | b9a5e3a6815d0e821cb5d2a8f997a31182e9c121 (patch) | |
| tree | 3729a72306cfb10cb856528b0066f2e595cf91a0 | |
| parent | 19c4c8c11849b87f6df6c7c64952fb867dd90566 (diff) | |
| parent | 9c57d0c307673d8ec2763dd22d01b45347a98d50 (diff) | |
| download | sdk-b9a5e3a6815d0e821cb5d2a8f997a31182e9c121.zip sdk-b9a5e3a6815d0e821cb5d2a8f997a31182e9c121.tar.gz sdk-b9a5e3a6815d0e821cb5d2a8f997a31182e9c121.tar.bz2 | |
am 9c57d0c3: am ab18c6fb: Merge "Correct incorrect test for RenderScript support." into idea133 automerge: 5afdda0
* commit '9c57d0c307673d8ec2763dd22d01b45347a98d50':
Correct incorrect test for RenderScript support.
| -rw-r--r-- | eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/project/LibraryClasspathContainerInitializer.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/project/LibraryClasspathContainerInitializer.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/project/LibraryClasspathContainerInitializer.java index 525e2fd..8fbee40 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/project/LibraryClasspathContainerInitializer.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/project/LibraryClasspathContainerInitializer.java @@ -338,18 +338,18 @@ public class LibraryClasspathContainerInitializer extends BaseClasspathContainer return null; } BuildToolInfo buildToolInfo = state.getBuildToolInfo(); - if (buildToolInfo != null) { + if (buildToolInfo == null) { buildToolInfo = Sdk.getCurrent().getLatestBuildTool(); if (buildToolInfo == null) { return null; } + } - File renderScriptSupportJar = RenderScriptProcessor.getSupportJar( - buildToolInfo.getLocation().getAbsolutePath()); + File renderScriptSupportJar = RenderScriptProcessor.getSupportJar( + buildToolInfo.getLocation().getAbsolutePath()); - jarFiles.add(renderScriptSupportJar); - } + jarFiles.add(renderScriptSupportJar); } // process all the libraries |