Skip to content

Commit

Permalink
Be more specific when checking for sysroot in clone.py
Browse files Browse the repository at this point in the history
  • Loading branch information
Ahrotahn committed Aug 15, 2024
1 parent 6159e2e commit fa3afd8
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions utils/depot_tools.patch
Original file line number Diff line number Diff line change
Expand Up @@ -35,18 +35,19 @@

if not self._get_option('process_all_deps', False):
should_process = should_process and _should_process(condition)
@@ -820,6 +822,10 @@ class Dependency(gclient_utils.WorkItem,
@@ -820,6 +822,11 @@ class Dependency(gclient_utils.WorkItem,
should_process_object = should_process and _should_process(
merged_condition)

+ if not f"{self._get_option('sysroot', 'None')}-sysroot" in name:
+ if not name.startswith("src/build/linux/") or \
+ not f"{self._get_option('sysroot', 'None')}-sysroot" in name:
+ continue
+ should_process_object = True
+ merged_condition = 'True'
gcs_deps.append(
GcsDependency(parent=self,
name=name,
@@ -929,6 +935,8 @@ class Dependency(gclient_utils.WorkItem,
@@ -929,6 +936,8 @@ class Dependency(gclient_utils.WorkItem,

self._gn_args_from = local_scope.get('gclient_gn_args_from')
self._gn_args_file = local_scope.get('gclient_gn_args_file')
Expand All @@ -55,7 +56,7 @@
self._gn_args = local_scope.get('gclient_gn_args', [])
# It doesn't make sense to set all of these, since setting gn_args_from
# to another DEPS will make gclient ignore any other local gn_args*
@@ -3923,6 +3931,7 @@ def CMDsync(parser, args):
@@ -3923,6 +3932,7 @@ def CMDsync(parser, args):
dest='experiments',
default=[],
help='Which experiments should be enabled.')
Expand Down

0 comments on commit fa3afd8

Please sign in to comment.