Skip to content

Commit

Permalink
Reland "Roll GN from e002e68a..f5f465b5"
Browse files Browse the repository at this point in the history
This reverts commit f89a9f1.

Reason for revert: Whoops. I was wrong, and I think the src-internal roll *has* landed.

Original change's description:
> Revert "Roll GN from e002e68a..f5f465b5"
>
> This reverts commit 7ba203c.
>
> Reason for revert: reverting since the src-internal roll hasn't landed yet.
>
> Original change's description:
> > Roll GN from e002e68a..f5f465b5
> >
> > Generated by //tools/gn/roll_gn.py
> >
> > https://gn.googlesource.com/gn/+log/e002e68a..f5f465b5
> >
> >     f5f465b5 Fix runtime_deps for elided targets
> >     3d165b90 Correct the `gn format --dump-tree=json ...` command to write to stdout instead of stderr.
> >     ad0a7ada Remove support for set_sources_assignment_filter function
> >     e1ac69b1 Add a command line to define/overwrite "root" in ".gn"
> >     7b2a04d5 VS: Use most recently installed Windows 10 SDK.
> >     132588e1 Revert "gn recipe: Link GN with rpmalloc to speed it up."
> >     3281c669 Add "framework_dirs" and "frameworks" to syntax highlighting rules
> >     4323e701 gn recipe: Link GN with rpmalloc to speed it up.
> >     c808630c Move runtime_deps file for phony targets to /obj
> >     8855c522 Update Clang and Xcode SDK to 12B5025f
> >     76f9b6ad Use fetch instead of cherry-pick for Gerrit changes
> >     a3d69e87 Don't return if package is up-to-date
> >     36ff17cb Switch back to the older Clang version
> >     7bcc0eb3 Revert "Update Xcode SDK to 12B5025f"
> >     e5f1f587 Update Xcode SDK to 12B5025f
> >     6453c5de Support cross-compiling GN for other targets
> >     42d6de6e Don't classify Rust static libraries as final
> >     a9eaeb80 Switch remaining stamp targets to phony targets
> >     ff45cf2a Show config.visibility in `gn desc`
> >     de5a8348 [rust project] removing obsolete std libraries
> >     4c684398 Fix "gn outputs" for bundle data.
> >     99f72f88 Switch source_set stamp targets to phony targets
> >     5233fa13 Remove extra * in gn output docs
> >
> > As of 99f72f88 and a9eaeb80, GN's usage of stamp files for intermediate
> > steps in the build graph have been replaced with phony aliases. As a
> > result, this CL also updates the MB tool to look for ".runtime_deps"
> > files instead of ".stamp.runtime_deps".
> >
> > This is a reland of 7f3e485
> >
> > Change-Id: I5bf18f1529b0969b8c79d768e9b3f377b8dee8cb
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2514460
> > Reviewed-by: Dirk Pranke <dpranke@google.com>
> > Commit-Queue: Dirk Pranke <dpranke@google.com>
> > Cr-Commit-Position: refs/heads/master@{#823725}
>
> TBR=dpranke@google.com,rjascani@google.com
>
> Change-Id: Iebf4e78bd9e7550de3b025a997d4f792c3f80b1b
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2518755
> Reviewed-by: Dirk Pranke <dpranke@google.com>
> Commit-Queue: Dirk Pranke <dpranke@google.com>
> Cr-Commit-Position: refs/heads/master@{#823727}

TBR=dpranke@google.com,rjascani@google.com

# Not skipping CQ checks because this is a reland.

Change-Id: I86d184461002eacaf42a96f1ea8901269ff7e856
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2518093
Reviewed-by: Dirk Pranke <dpranke@google.com>
Commit-Queue: Dirk Pranke <dpranke@google.com>
Cr-Commit-Position: refs/heads/master@{#823791}
  • Loading branch information
dpranke authored and Commit Bot committed Nov 3, 2020
1 parent da31744 commit bf11011
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 10 deletions.
2 changes: 1 addition & 1 deletion DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ vars = {
# revisions.

# GN CIPD package version.
'gn_version': 'git_revision:e002e68a48d1c82648eadde2f6aafa20d08c36f2',
'gn_version': 'git_revision:f5f465b52e5df6d4de9fbe67cc79f1914ba4dbfc',

# Also, if you change these, update buildtools/DEPS too. Also update the
# libc++ svn_revision in //buildtools/deps_revisions.gni.
Expand Down
2 changes: 1 addition & 1 deletion buildtools/DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ vars = {
#

# GN CIPD package version.
'gn_version': 'git_revision:e002e68a48d1c82648eadde2f6aafa20d08c36f2',
'gn_version': 'git_revision:f5f465b52e5df6d4de9fbe67cc79f1914ba4dbfc',

# When changing these, also update the svn revisions in deps_revisions.gni
'clang_format_revision': '96636aa0e9f047f17447f2d45a094d0b59ed7917',
Expand Down
14 changes: 6 additions & 8 deletions tools/mb/mb.py
Original file line number Diff line number Diff line change
Expand Up @@ -1192,7 +1192,7 @@ def PossibleRuntimeDepsPaths(self, vals, ninja_targets, isolate_map):
for target in ninja_targets:
target_type = isolate_map[target]['type']
label = isolate_map[target]['label']
stamp_runtime_deps = 'obj/%s.stamp.runtime_deps' % label.replace(':', '/')
runtime_deps = 'obj/%s.runtime_deps' % label.replace(':', '/')
# TODO(https://crbug.com/876065): 'official_tests' use
# type='additional_compile_target' to isolate tests. This is not the
# intended use for 'additional_compile_target'.
Expand All @@ -1205,23 +1205,21 @@ def PossibleRuntimeDepsPaths(self, vals, ninja_targets, isolate_map):
elif fuchsia or ios or target_type == 'generated_script':
# iOS and Fuchsia targets end up as groups.
# generated_script targets are always actions.
rpaths = [stamp_runtime_deps]
rpaths = [runtime_deps]
elif android:
# Android targets may be either android_apk or executable. The former
# will result in runtime_deps associated with the stamp file, while the
# will result in runtime_deps associated with the target, while the
# latter will result in runtime_deps associated with the executable.
label = isolate_map[target]['label']
rpaths = [
target + '.runtime_deps',
stamp_runtime_deps]
rpaths = [target + '.runtime_deps', runtime_deps]
elif (target_type == 'script'
or isolate_map[target].get('label_type') == 'group'):
# For script targets, the build target is usually a group,
# for which gn generates the runtime_deps next to the stamp file
# for which gn generates the runtime_deps in the build directory
# for the label, which lives under the obj/ directory, but it may
# also be an executable.
label = isolate_map[target]['label']
rpaths = [stamp_runtime_deps]
rpaths = [runtime_deps]
if win:
rpaths += [ target + '.exe.runtime_deps' ]
else:
Expand Down

0 comments on commit bf11011

Please sign in to comment.