birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Integrating latest 47acbe8

Browse Source
This commit is contained in:
alexpete
2021-03-25 13:57:57 -07:00
parent 448c549698
commit 75dc720198
10312 changed files with 2711566 additions and 671451 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/Tools/Platform/Android/android_support.py
+1 -1
View File
@@ -1563,7 +1563,7 @@ class AdbTool(common.CommandLineExec):
device_result_lines = [device_result_line.strip() for device_result_line in devices_result.split('\n') if
device_result_line]
for device_result_line in device_result_lines:
match_result = re.match(r'(\w+)\s+(device)', device_result_line)
match_result = re.match(r'([\w-]+)\s+(device)', device_result_line)
if match_result:
device_id = match_result.group(1)
connected_device_serials.append(device_id)