Skip to content

Commit

Permalink
Remove remntants of old selection option
Browse files Browse the repository at this point in the history
Change-Id: Ie535ae17087f348bb0b053bc8b4df4212c300d1e
  • Loading branch information
naomipappe authored and MarkY-LunarG committed Jan 29, 2025
1 parent 5f9fab3 commit 7b830a6
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions android/scripts/gfxrecon.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ def CheckDeviceSelection():
devices = QueryAvailableDevices()
if len(devices) <= 1:
return

selection = os.getenv(android_serial)
if selection is None or selection == '':
raise DeviceSelectionException('Multiple devices detected - you must specify which one to use by setting ANDROID_SERIAL environment variable.')
Expand Down Expand Up @@ -365,17 +365,13 @@ def Replay(replay_args):
if extras:
if args.push_file:
cmd = ' '.join([adb_push, args.push_file, args.file])
if selection is not None:
cmd = InsertDeviceSelectionArgument(cmd, selection)
print('Executing:', cmd)
subprocess.check_call(shlex.split(cmd, posix='win' not in sys.platform))

print('Executing:', adb_stop)
subprocess.check_call(shlex.split(adb_stop, posix='win' not in sys.platform))

cmd = ' '.join([adb_start, '--es', '"args"', '"{}"'.format(extras)])
if selection is not None:
cmd = InsertDeviceSelectionArgument(cmd, selection)
print('Executing:', cmd)

# Specify posix=False to prevent removal of quotes from adb extras.
Expand Down

0 comments on commit 7b830a6

Please sign in to comment.