Don't run adb as part of shelldb boot

sky/tools/shelldb

 #!/usr/bin/env python
 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 from skypy.skyserver import SkyServer
 import argparse
 import hashlib
 import json
 import logging
@@ skipping 26 matching lines @@
 PID_FILE_KEYS = frozenset([
     'remote_sky_server_port',
     'sky_server_pid',
     'sky_server_port',
     'sky_server_root',
     'build_dir',
     'sky_shell_pid',
     '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.
   re.compile(r'^$'),
   re.compile(r'^Analyzing \['),
   re.compile(r'^No issues found'),
   re.compile(r'^[0-9]+ errors? and [0-9]+ warnings? found.'),
   re.compile(r'^([0-9]+|No) (error|warning|issue)s? found.'),
 
   # TODO: Remove once sdk-extensions are in place
@@ skipping 277 matching lines @@
         ]
         gdb_path = '/usr/bin/gdb'
 
         eval_commands = [
             'directory %s' % SRC_ROOT,
             # TODO(eseidel): What file do I point it at?  The apk?
             #'file %s' % self.paths.mojo_shell_path,
             '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
 
         # TODO(eseidel): We need to look up the toolchain somehow?
         if platform.system() == 'Darwin':
             gdb_path = os.path.join(SRC_ROOT, 'third_party/android_tools/ndk/'
                 'toolchains/arm-linux-androideabi-4.9/prebuilt/darwin-x86_64/'
                 'bin/arm-linux-androideabi-gdb')
         else:
             gdb_path = os.path.join(SRC_ROOT, 'third_party/android_tools/ndk/'
@@ skipping 172 matching lines @@
         args = parser.parse_args()
         pids = Pids.read_from(PID_FILE_PATH, PID_FILE_KEYS)
         exit_code = args.func(args, pids)
         # We could do this with an at-exit handler instead?
         pids.write_to(PID_FILE_PATH)
         sys.exit(exit_code)
 
 
 if __name__ == '__main__':
     SkyShellRunner().main()