diff options
| author | Siva Velusamy <vsiva@google.com> | 2014-02-28 18:53:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-02-28 18:53:23 +0000 |
| commit | 6589b3fa15b7e108ca90cad391cf7d50cffd78b3 (patch) | |
| tree | b46ffe71f0dc06205c8159e384623fa99ada5655 | |
| parent | 5281ea1ba94ed4ff8fb6996b89249428b6eb7014 (diff) | |
| parent | 0a313f3a938c335800486529500c9f65849e15a4 (diff) | |
| download | sdk-6589b3fa15b7e108ca90cad391cf7d50cffd78b3.zip sdk-6589b3fa15b7e108ca90cad391cf7d50cffd78b3.tar.gz sdk-6589b3fa15b7e108ca90cad391cf7d50cffd78b3.tar.bz2 | |
Merge "Fix path to dexdump" into idea133
| -rwxr-xr-x | eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/actions/DexDumpAction.java | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/actions/DexDumpAction.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/actions/DexDumpAction.java index a483e9b..289cf24 100755 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/actions/DexDumpAction.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/actions/DexDumpAction.java @@ -21,6 +21,7 @@ import com.android.annotations.Nullable; import com.android.ide.eclipse.adt.AdtPlugin; import com.android.ide.eclipse.adt.internal.preferences.AdtPrefs.BuildVerbosity; import com.android.ide.eclipse.adt.internal.sdk.Sdk; +import com.android.sdklib.BuildToolInfo; import com.android.sdklib.util.GrabProcessOutput; import com.android.sdklib.util.GrabProcessOutput.IProcessOutput; import com.android.sdklib.util.GrabProcessOutput.Wait; @@ -126,9 +127,15 @@ public class DexDumpAction implements IObjectActionDelegate { return Status.OK_STATUS; } - String sdkOsPath = current.getSdkLocation(); - File dexDumpFile = new File(new File(sdkOsPath, SdkConstants.FD_PLATFORM_TOOLS), - SdkConstants.FN_DEXDUMP); + BuildToolInfo buildToolInfo = current.getLatestBuildTool(); + if (buildToolInfo == null) { + AdtPlugin.printErrorToConsole(project, + "SDK missing build tools. Please install build tools using SDK Manager."); + return Status.OK_STATUS; + } + + File buildToolsFolder = buildToolInfo.getLocation(); + File dexDumpFile = new File(buildToolsFolder, SdkConstants.FN_DEXDUMP); IPath binPath = project.getFolder(SdkConstants.FD_OUTPUT).getLocation(); if (binPath == null) { |