encounter/engine
0
0
Fork 0
mirror of https://github.com/encounter/engine.git synced 2026-03-30 11:09:55 -07:00
Code Issues Packages Projects Releases Wiki Activity

Make the new sysroot format the default in flutter_gdb (#4576)

Browse Source
This commit is contained in:
Jason Simmons
2018-01-19 15:12:00 -08:00
committed by GitHub
parent 53a9540751
commit 6bc4e7e9e4
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sky/tools/flutter_gdb
+9 -9
View File
@@ -81,11 +81,11 @@ class GdbClient(object):
parser.add_argument('--no-pull-libs', action="store_false",
default=True, dest="pull_libs",
help="Do not copy system libraries from the device to the host")
parser.add_argument('--sysroot', action="store_true", default=False,
help='Create a sysroot tree suitable for debugging on Android N')
parser.add_argument('--old-sysroot', action="store_true", default=False,
help='Create a sysroot tree suitable for debugging on older (pre-N) versions of Android')
parser.set_defaults(func=self.run)
def _copy_system_libs(self, adb_path, package, sysroot):
def _copy_system_libs(self, adb_path, package, old_sysroot):
"""Copy libraries used by the Flutter process from the device to the host."""
package_pid = _find_package_pid(adb_path, package)
if package_pid is None:
@@ -96,14 +96,14 @@ class GdbClient(object):
[adb_path, 'shell', 'run-as', package, 'cat', '/proc/%d/maps' % package_pid])
proc_libs = re.findall('(/system/.*\.(?:so|oat))\s*$', proc_maps, re.MULTILINE)
if sysroot:
if old_sysroot:
device_libs = set((lib, os.path.basename(lib)) for lib in proc_libs)
device_libs.add(('/system/bin/linker', 'linker'))
else:
device_libs = set((lib, lib[1:]) for lib in proc_libs)
device_libs.add(('/system/bin/linker', 'system/bin/linker'))
device_libs.add(('/system/bin/app_process32', 'system/bin/app_process32'))
device_libs.add(('/system/bin/app_process64', 'system/bin/app_process64'))
else:
device_libs = set((lib, os.path.basename(lib)) for lib in proc_libs)
device_libs.add(('/system/bin/linker', 'linker'))
if os.path.isdir(GdbClient.SYSTEM_LIBS_PATH):
shutil.rmtree(GdbClient.SYSTEM_LIBS_PATH)
@@ -126,7 +126,7 @@ class GdbClient(object):
adb_path = args.adb
if args.pull_libs:
if not self._copy_system_libs(adb_path, args.package, args.sysroot):
if not self._copy_system_libs(adb_path, args.package, args.old_sysroot):
return 1
subprocess.check_call(
@@ -144,7 +144,7 @@ class GdbClient(object):
return 1
eval_commands = []
if args.sysroot:
if not args.old_sysroot:
eval_commands.append('set sysroot %s' % GdbClient.SYSTEM_LIBS_PATH)
eval_commands.append('set solib-search-path %s:%s' %
(debug_out_path, GdbClient.SYSTEM_LIBS_PATH))