diff options
| author | Xavier Ducrohet <xav@android.com> | 2013-06-26 16:55:42 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-06-26 16:55:42 -0700 |
| commit | c1e820eee3b1ef3bad26640f08ddc254a0c92494 (patch) | |
| tree | 1b31bc8ccd8b660ab4b22fc53c23db82804a1b07 | |
| parent | 68f5155417aaa2b424281eea5936f51526b6c4d7 (diff) | |
| parent | 4384fa2c630b36e5dc0ad1ae5edd0218d1c397be (diff) | |
| download | sdk-c1e820eee3b1ef3bad26640f08ddc254a0c92494.zip sdk-c1e820eee3b1ef3bad26640f08ddc254a0c92494.tar.gz sdk-c1e820eee3b1ef3bad26640f08ddc254a0c92494.tar.bz2 | |
am 4384fa2c: am 504bf5c4: Merge "Fix renderscript in Eclipse."
* commit '4384fa2c630b36e5dc0ad1ae5edd0218d1c397be':
Fix renderscript in Eclipse.
| -rw-r--r-- | eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/RenderScriptProcessor.java | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/RenderScriptProcessor.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/RenderScriptProcessor.java index af58e41..817b806 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/RenderScriptProcessor.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/RenderScriptProcessor.java @@ -24,7 +24,6 @@ import com.android.ide.eclipse.adt.internal.build.builders.BaseBuilder; import com.android.ide.eclipse.adt.internal.preferences.AdtPrefs; import com.android.ide.eclipse.adt.internal.preferences.AdtPrefs.BuildVerbosity; import com.android.ide.eclipse.adt.internal.project.BaseProjectHelper; -import com.android.ide.eclipse.adt.internal.sdk.Sdk; import com.android.resources.ResourceFolderType; import com.android.sdklib.BuildToolInfo; import com.android.sdklib.IAndroidTarget; @@ -173,8 +172,6 @@ public class RenderScriptProcessor extends SourceProcessor { List<IPath> sourceFolders, List<IFile> notCompiledOut, List<File> libraryProjectsOut, IProgressMonitor monitor) throws CoreException { - String sdkOsPath = Sdk.getCurrent().getSdkLocation(); - IFolder genFolder = getGenFolder(); IFolder rawFolder = project.getFolder( @@ -182,15 +179,16 @@ public class RenderScriptProcessor extends SourceProcessor { int depIndex; + BuildToolInfo buildToolInfo = getBuildToolInfo(); + // create the command line String[] command = new String[15]; int index = 0; - command[index++] = quote(sdkOsPath + SdkConstants.OS_SDK_PLATFORM_TOOLS_FOLDER - + SdkConstants.FN_RENDERSCRIPT); + command[index++] = quote(buildToolInfo.getPath(BuildToolInfo.PathId.LLVM_RS_CC)); command[index++] = "-I"; //$NON-NLS-1$ - command[index++] = quote(getBuildToolInfo().getPath(BuildToolInfo.PathId.ANDROID_RS_CLANG)); + command[index++] = quote(buildToolInfo.getPath(BuildToolInfo.PathId.ANDROID_RS_CLANG)); command[index++] = "-I"; //$NON-NLS-1$ - command[index++] = quote(getBuildToolInfo().getPath(BuildToolInfo.PathId.ANDROID_RS)); + command[index++] = quote(buildToolInfo.getPath(BuildToolInfo.PathId.ANDROID_RS)); command[index++] = "-p"; //$NON-NLS-1$ command[index++] = quote(genFolder.getLocation().toOSString()); command[index++] = "-o"; //$NON-NLS-1$ |