diff options
| author | Siva Velusamy <vsiva@google.com> | 2014-06-27 18:24:31 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-06-27 18:24:31 +0000 |
| commit | 37d165a8c46afc4cde9d81f20a1e68336cc20f38 (patch) | |
| tree | ef04ea6bafd1779120336773ae9df820d578f1ac /eclipse | |
| parent | edbe9171d2586fcd4083c5a9d848ab27d2e7c72e (diff) | |
| parent | d187c91b92e0609696225fdae0aa905058596df8 (diff) | |
| download | sdk-37d165a8c46afc4cde9d81f20a1e68336cc20f38.zip sdk-37d165a8c46afc4cde9d81f20a1e68336cc20f38.tar.gz sdk-37d165a8c46afc4cde9d81f20a1e68336cc20f38.tar.bz2 | |
Merge "monitor: Update path to hprof-conv" into idea133
automerge: d187c91
* commit 'd187c91b92e0609696225fdae0aa905058596df8':
monitor: Update path to hprof-conv
Diffstat (limited to 'eclipse')
| -rw-r--r-- | eclipse/plugins/com.android.ide.eclipse.monitor/src/com/android/ide/eclipse/monitor/SdkToolsLocator.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.monitor/src/com/android/ide/eclipse/monitor/SdkToolsLocator.java b/eclipse/plugins/com.android.ide.eclipse.monitor/src/com/android/ide/eclipse/monitor/SdkToolsLocator.java index 64129d2..bd8ef60 100644 --- a/eclipse/plugins/com.android.ide.eclipse.monitor/src/com/android/ide/eclipse/monitor/SdkToolsLocator.java +++ b/eclipse/plugins/com.android.ide.eclipse.monitor/src/com/android/ide/eclipse/monitor/SdkToolsLocator.java @@ -61,7 +61,7 @@ public class SdkToolsLocator { } public String getHprofConvLocation() { - return new File(getSdkToolsFolder(), FN_HPROF_CONV).getAbsolutePath(); + return new File(getSdkPlatformToolsFolder(), FN_HPROF_CONV).getAbsolutePath(); } private String getSdkToolsFolder() { |