Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(790)

Unified Diff: sky/tools/shelldb

Issue 1161843007: Don't run adb as part of shelldb boot (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/tools/shelldb
diff --git a/sky/tools/shelldb b/sky/tools/shelldb
index 369b5efc57bba9c77bda0c9713162f24a58dd775..1fe60a2b2fb57b1a62fd94f00a3c5d9148b5c693 100755
--- a/sky/tools/shelldb
+++ b/sky/tools/shelldb
@@ -44,8 +44,7 @@ PID_FILE_KEYS = frozenset([
'remote_gdbserver_port',
])
-# TODO(iansf): Fix undefined behavior when you have more than one device attached.
-SYSTEM_LIBS_ROOT_PATH = '/tmp/device_libs/%s' % (subprocess.check_output(['adb', 'get-serialno']).strip())
+SYSTEM_LIBS_ROOT_PATH = '/tmp/device_libs'
_IGNORED_PATTERNS = [
# Ignored because they're not indicative of specific errors.
@@ -343,10 +342,12 @@ class GDBAttach(object):
'target remote localhost:%s' % GDB_PORT,
]
- system_lib_dirs = self._pull_system_libraries(pids,
- SYSTEM_LIBS_ROOT_PATH)
- eval_commands.append(
- 'set solib-absolute-prefix %s' % SYSTEM_LIBS_ROOT_PATH)
+ # TODO(iansf): Fix undefined behavior when you have more than one device attached.
+ device_id = subprocess.check_output([ADB_PATH, 'get-serialno']).strip()
+ device_libs_path = os.path.join(SYSTEM_LIBS_ROOT_PATH, device_id)
+
+ system_lib_dirs = self._pull_system_libraries(pids, device_libs_path)
+ eval_commands.append('set solib-absolute-prefix %s' % device_libs_path)
symbol_search_paths = system_lib_dirs + symbol_search_paths
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698