diff options
| author | Xavier Ducrohet <xav@android.com> | 2014-07-21 19:40:02 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-07-21 19:40:02 +0000 |
| commit | ab18c6fb3cc51bb0ab18afe27ff343656bab1a13 (patch) | |
| tree | 1497eb76974032e36e8e3d3cacfacf49b00cd34e /eclipse | |
| parent | 73c8b247d6721c394d84155cc4ba5d7e71778e0d (diff) | |
| parent | 5afdda0e90c1900d7f249985ddc09ed4a98ce053 (diff) | |
| download | sdk-ab18c6fb3cc51bb0ab18afe27ff343656bab1a13.zip sdk-ab18c6fb3cc51bb0ab18afe27ff343656bab1a13.tar.gz sdk-ab18c6fb3cc51bb0ab18afe27ff343656bab1a13.tar.bz2 | |
Merge "Correct incorrect test for RenderScript support." into idea133
automerge: 5afdda0
* commit '5afdda0e90c1900d7f249985ddc09ed4a98ce053':
Correct incorrect test for RenderScript support.
Diffstat (limited to 'eclipse')
| -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 |