aboutsummaryrefslogtreecommitdiffhomepage
path: root/gn
diff options
context:
space:
mode:
authorGravatar mtklein <mtklein@chromium.org>2016-08-02 14:28:26 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-08-02 14:28:26 -0700
commitada5a44f3bdac10a8a0c53b34f5add7aea9fdbb0 (patch)
tree21f183e93f41c76326bc0ce90561823f8a8f1b8b /gn
parenta25f470bc7bef67e7b0486efabf8cbf60a064c9c (diff)
GN: get echo-headers sources via exec_script
exec_script runs every time gn does, which is explicitly on every one of our bot runs. That should be enough to obviate the .git/logs/HEAD hack. Easiest way to do this was to swap around find.py's argument order to allow multiple search directories. This is the root of all the .gyp changes. This moves the blacklist into BUILD.gn, which I think is nice. It expands it a little as we're now searching recursively, into include/gpu/vk which we can't include safely without the Vulkan SDK. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2205903004 Review-Url: https://codereview.chromium.org/2205903004
Diffstat (limited to 'gn')
-rw-r--r--gn/echo_headers.py16
1 files changed, 2 insertions, 14 deletions
diff --git a/gn/echo_headers.py b/gn/echo_headers.py
index 83938b3e2a..059838a6ff 100644
--- a/gn/echo_headers.py
+++ b/gn/echo_headers.py
@@ -6,23 +6,11 @@
# found in the LICENSE file.
import sys
-import os
-import os.path
-blacklist = [
- 'GrGLConfig_chrome.h',
- 'SkFontMgr_fontconfig.h',
-]
-
-headers = []
-for d in sys.argv[2:]:
- headers.extend([f for f in os.listdir(d)
- if os.path.isfile(os.path.join(d,f)) and f.endswith('.h')])
with open(sys.argv[1], "w") as f:
f.write('// skia.h generated by GN.\n')
f.write('#ifndef skia_h_DEFINED\n')
f.write('#define skia_h_DEFINED\n')
- for h in headers:
- if h not in blacklist:
- f.write('#include "' + h + '"\n')
+ for h in sys.argv[2:]:
+ f.write('#include "' + h + '"\n')
f.write('#endif//skia_h_DEFINED\n')