diff options
| -rw-r--r-- | BUILD.gn | 24 | ||||
| -rwxr-xr-x | gn/echo_headers.py | 16 | ||||
| -rw-r--r-- | gn/find_headers.py | 54 |
3 files changed, 60 insertions, 34 deletions
@@ -667,26 +667,14 @@ component("skia") { } } -skia_h_headers = exec_script("gyp/find.py", - [ "*.h" ] + rebase_path(skia_public_includes), - "list lines", - []) - - [ - rebase_path("include/gpu/gl/GrGLConfig_chrome.h"), - rebase_path("include/gpu/vk/GrVkBackendContext.h"), - rebase_path("include/gpu/vk/GrVkDefines.h"), - rebase_path("include/gpu/vk/GrVkInterface.h"), - rebase_path("include/gpu/vk/GrVkTypes.h"), - rebase_path("include/ports/SkFontMgr_fontconfig.h"), - ] - action("skia.h") { - script = "gn/echo_headers.py" - args = [ rebase_path("$target_gen_dir/skia.h", root_build_dir) ] + - rebase_path(skia_h_headers, target_gen_dir) - inputs = skia_h_headers + skia_h = "$target_gen_dir/skia.h" + script = "gn/find_headers.py" + args = [ rebase_path(skia_h, root_build_dir) ] + + rebase_path(skia_public_includes) + depfile = "$skia_h.deps" outputs = [ - "$target_gen_dir/skia.h", + skia_h, ] } diff --git a/gn/echo_headers.py b/gn/echo_headers.py deleted file mode 100755 index 059838a6ff..0000000000 --- a/gn/echo_headers.py +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/env python -# -# Copyright 2016 Google Inc. -# -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -import sys - -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 sys.argv[2:]: - f.write('#include "' + h + '"\n') - f.write('#endif//skia_h_DEFINED\n') diff --git a/gn/find_headers.py b/gn/find_headers.py new file mode 100644 index 0000000000..4ade28de71 --- /dev/null +++ b/gn/find_headers.py @@ -0,0 +1,54 @@ +#!/usr/bin/env python +# +# Copyright 2016 Google Inc. +# +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import os +import sys + +# We'll recursively search each include directory for headers, +# then write them to skia.h with a small blacklist. + +# We'll also write skia.h.deps, which Ninja uses to track dependencies. It's the +# very same mechanism Ninja uses to know which .h files affect which .cpp files. + +skia_h = sys.argv[1] +include_dirs = sys.argv[2:] + +blacklist = { + "GrGLConfig_chrome.h", + "GrVkBackendContext.h", + "GrVkDefines.h", + "GrVkInterface.h", + "GrVkTypes.h", + "SkFontMgr_fontconfig.h", +} + +headers = [] +for directory in include_dirs: + for d, _, files in os.walk(directory): + for f in files: + if f.endswith('.h') and f not in blacklist: + headers.append(os.path.join(d,f)) +headers.sort() + +with open(skia_h, "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: + f.write('#include "' + h + '"\n') + f.write('#endif//skia_h_DEFINED\n') + +with open(skia_h + '.deps', "w") as f: + f.write(skia_h + ':') + for h in headers: + f.write(' ' + h) + f.write('\n') + +# Temporary: during development this file wrote skia.h.d, not skia.h.deps, +# and I think we have some bad versions of those files laying around. +if os.path.exists(skia_h + '.d'): + os.remove(skia_h + '.d') |