Revert "Disassociate runtime_deps from the stamp file"

This reverts commit 73ed5430bf.

Reason for revert: The underlying change in GN that required the GN change is going to be out for a while so we will revert this change for now.

Original change's description:
> Disassociate runtime_deps from the stamp file
>
> Bug: v8:11102
> Change-Id: I40ce923a42097bf76a4b53c61bab1ef983523f64
> Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2519557
> Reviewed-by: Michael Achenbach <machenbach@chromium.org>
> Commit-Queue: Almothana Athamneh <almuthanna@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#70968}

TBR=machenbach@chromium.org,almuthanna@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: v8:11102
Change-Id: Id5a1eccfc3d4b552ab0184d283dbcf8ce5ca4255
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2521912
Reviewed-by: Michael Achenbach <machenbach@chromium.org>
Commit-Queue: Almothana Athamneh <almuthanna@chromium.org>
Cr-Commit-Position: refs/heads/master@{#70998}
This commit is contained in:
Almothana Athamneh 2020-11-05 20:57:13 +01:00 committed by Commit Bot
parent b8761260dc
commit 4047858ef7
2 changed files with 3 additions and 3 deletions

2
DEPS
View File

@ -50,7 +50,7 @@ vars = {
'mac_xcode_version': 'default',
# GN CIPD package version.
'gn_version': 'git_revision:f5f465b52e5df6d4de9fbe67cc79f1914ba4dbfc',
'gn_version': 'git_revision:e002e68a48d1c82648eadde2f6aafa20d08c36f2',
# luci-go CIPD package version.
'luci_go': 'git_revision:1a022d3a4c50be4207ee93451255d71896416596',

View File

@ -756,7 +756,7 @@ class MetaBuildWrapper(object):
label = isolate_map[target]['label']
runtime_deps_targets = [
target + '.runtime_deps',
'obj/%s.runtime_deps' % label.replace(':', '/')]
'obj/%s.stamp.runtime_deps' % label.replace(':', '/')]
elif (isolate_map[target]['type'] == 'script' or
isolate_map[target].get('label_type') == 'group'):
# For script targets, the build target is usually a group,
@ -765,7 +765,7 @@ class MetaBuildWrapper(object):
# also be an executable.
label = isolate_map[target]['label']
runtime_deps_targets = [
'obj/%s.runtime_deps' % label.replace(':', '/')]
'obj/%s.stamp.runtime_deps' % label.replace(':', '/')]
if self.platform == 'win32':
runtime_deps_targets += [ target + '.exe.runtime_deps' ]
else: