Commit d5339a20 authored by Ian Clelland's avatar Ian Clelland Committed by Commit Bot

Revert "mac: Enable gn check for data vars pointing to directories below the build dir."

This reverts commit 5eb2341c.

Reason for revert: Breaks build at
https://ci.chromium.org/p/chrome/builders/ci/mac-google-rel/4397

(Maybe some others need to be whitelisted as well)

Original change's description:
> mac: Enable gn check for data vars pointing to directories below the build dir.
> 
> Mac bundles violate this constraint, so this adds many whitelist entries.
> Fixing them seems not super easy, so I filed https://crbug.com/1000667 for it.
> 
> Bug: 1000667, 912946
> Change-Id: Ibc1704fe779c6ccc86871a1b651f52572db3f919
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1780883
> Commit-Queue: Nico Weber <thakis@chromium.org>
> Reviewed-by: Takuto Ikuta <tikuta@chromium.org>
> Auto-Submit: Nico Weber <thakis@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#693705}

TBR=thakis@chromium.org,tikuta@chromium.org

Change-Id: Ib2ad91564aefb659e5a18d9caad43947b5159944
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1000667, 912946
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1787861Reviewed-by: default avatarIan Clelland <iclelland@chromium.org>
Commit-Queue: Ian Clelland <iclelland@chromium.org>
Cr-Commit-Position: refs/heads/master@{#693715}
parent e2cc2677
...@@ -1092,7 +1092,7 @@ class MetaBuildWrapper(object): ...@@ -1092,7 +1092,7 @@ class MetaBuildWrapper(object):
# Skip a few configs that need extra cleanup for now. # Skip a few configs that need extra cleanup for now.
# TODO(https://crbug.com/912946): Fix everything on all platforms and # TODO(https://crbug.com/912946): Fix everything on all platforms and
# enable check everywhere. # enable check everywhere.
if is_android or is_cros: if is_android or is_cros or is_mac:
break break
# Skip a few existing violations that need to be cleaned up. Each of # Skip a few existing violations that need to be cleaned up. Each of
...@@ -1103,19 +1103,7 @@ class MetaBuildWrapper(object): ...@@ -1103,19 +1103,7 @@ class MetaBuildWrapper(object):
f == 'mr_extension/' or # https://crbug.com/997947 f == 'mr_extension/' or # https://crbug.com/997947
f == 'locales/' or f == 'locales/' or
f.startswith('nacl_test_data/') or f.startswith('nacl_test_data/') or
f.startswith('ppapi_nacl_tests_libs/') or f.startswith('ppapi_nacl_tests_libs/')):
(is_mac and f in ( # https://crbug.com/1000667
'Chromium Framework.framework/',
'Chromium Helper.app/',
'Chromium.app/',
'Content Shell.app/',
'blink_deprecated_test_plugin.plugin/',
'blink_test_plugin.plugin/',
'corb_test_plugin.plugin/',
'power_saver_test_plugin.plugin/',
'ppapi_tests.plugin/',
'ui_unittests Framework.framework/',
))):
continue continue
# This runs before the build, so we can't use isdir(f). But # This runs before the build, so we can't use isdir(f). But
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment