From 8dcd36b95befc1de9889a2399e9c7d5607eae9db Mon Sep 17 00:00:00 2001 From: Eric Seidel Date: Fri, 29 May 2015 15:38:59 -0700 Subject: [PATCH] Fix skydb on linux when adb is not in path. TBR=iansf@google.com Review URL: https://codereview.chromium.org/1159193003 --- engine/src/flutter/tools/skydb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/engine/src/flutter/tools/skydb b/engine/src/flutter/tools/skydb index 1a52855603..1372ef8c86 100755 --- a/engine/src/flutter/tools/skydb +++ b/engine/src/flutter/tools/skydb @@ -37,13 +37,14 @@ ANDROID_APK_NAME = 'MojoShell.apk' PID_FILE_PATH = "/tmp/skydb.pids" CACHE_LINKS_PATH = '/tmp/mojo_cache_links' -# 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()) SRC_ROOT = skypy.paths.Paths('ignored').src_root ADB_PATH = os.path.join(SRC_ROOT, 'third_party/android_tools/sdk/platform-tools/adb') +# 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_PATH, 'get-serialno']).strip()) + # FIXME: Move this into mopy.config def gn_args_from_build_dir(build_dir):