diff options
author | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-24 16:09:18 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2009-07-24 16:09:18 -0700 |
commit | eb6bad0f56b6d2ff5514992726dcd9f4b56c1e36 (patch) | |
tree | 21bf811527e03da4506bb874c3cb5d3df08e5204 /ddms | |
parent | 53ac3703af34fc2e7d80176488289e3beecbae42 (diff) | |
parent | 03f645cd886fdce2078a6ad45ab9dbefbd35b8aa (diff) | |
download | sdk-eb6bad0f56b6d2ff5514992726dcd9f4b56c1e36.zip sdk-eb6bad0f56b6d2ff5514992726dcd9f4b56c1e36.tar.gz sdk-eb6bad0f56b6d2ff5514992726dcd9f4b56c1e36.tar.bz2 |
am 686fddb0: Merge change 8528 into donut
Merge commit '686fddb069e0031d92453703979acd7d699cf761'
* commit '686fddb069e0031d92453703979acd7d699cf761':
Allow override of default symbol location for native heap library resolution
Diffstat (limited to 'ddms')
-rw-r--r-- | ddms/libs/ddmuilib/src/com/android/ddmuilib/Addr2Line.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ddms/libs/ddmuilib/src/com/android/ddmuilib/Addr2Line.java b/ddms/libs/ddmuilib/src/com/android/ddmuilib/Addr2Line.java index a2f12d5..47e0933 100644 --- a/ddms/libs/ddmuilib/src/com/android/ddmuilib/Addr2Line.java +++ b/ddms/libs/ddmuilib/src/com/android/ddmuilib/Addr2Line.java @@ -133,7 +133,10 @@ public class Addr2Line { // to synchronize this code. // get the output directory. - String symbols = DdmUiPreferences.getSymbolDirectory(); + String symbols = System.getenv("ANDROID_SYMBOLS"); + if (symbols == null) { + symbols = DdmUiPreferences.getSymbolDirectory(); + } // build the command line String[] command = new String[5]; |