Skip to content

Commit

Permalink
Add a flag for the path to the adb tool in the flutter_gdb script (fl…
Browse files Browse the repository at this point in the history
  • Loading branch information
jason-simmons authored Apr 3, 2017
1 parent 4eac094 commit 9328229
Showing 1 changed file with 9 additions and 2 deletions.
11 changes: 9 additions & 2 deletions sky/tools/flutter_gdb
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,10 @@ class GdbClient(object):

def run(self, args):
flutter_root = _get_flutter_root()
adb_path = os.path.join(flutter_root, ADB_LOCAL_PATH)
if args.adb is None:
adb_path = os.path.join(flutter_root, ADB_LOCAL_PATH)
else:
adb_path = args.adb

if args.pull_libs:
if not self._copy_system_libs(adb_path, args.package, args.sysroot):
Expand Down Expand Up @@ -140,7 +143,10 @@ class GdbServer(object):

def run(self, args):
flutter_root = _get_flutter_root()
adb_path = os.path.join(flutter_root, ADB_LOCAL_PATH)
if args.adb is None:
adb_path = os.path.join(flutter_root, ADB_LOCAL_PATH)
else:
adb_path = args.adb

package_pid = _find_package_pid(adb_path, args.package)
if package_pid is None:
Expand All @@ -167,6 +173,7 @@ class GdbServer(object):
def main():
parser = argparse.ArgumentParser(description='Flutter debugger tool')
subparsers = parser.add_subparsers(help='sub-command help')
parser.add_argument('--adb', type=str, help='path to ADB tool')

commands = [
GdbClient(),
Expand Down

0 comments on commit 9328229

Please sign in to comment.