diff options
| author |  djsollen <djsollen@google.com> | 2016-03-30 08:28:02 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-30 08:28:02 -0700 |
| commit | 7c9c4a775dcc3517f46b7734c86b29d93ec9be4a (patch) | |
| tree | 8f92f1be2e4fca04c3794a82ee73959b40ca07d6 | |
| parent | 40d8d62854b725b30876a01f5038c51033758f08 (diff) | |
Force include test to run on every compile.
Also fix the tool to stop looking in the src dir for includes.
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1839123004
Review URL: https://codereview.chromium.org/1839123004
| -rw-r--r-- | gyp/tools.gyp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/gyp/tools.gyp b/gyp/tools.gyp index 49e441b9e2..7bf8f7f786 100644 --- a/gyp/tools.gyp +++ b/gyp/tools.gyp @@ -466,10 +466,12 @@ '<(skia_include_path)/views/SkWindow.h', '<(skia_include_path)/gpu/vk', ], + 'output_file' : [ + '<(INTERMEDIATE_DIR)/test_public_includes.cpp', + ], }, 'include_dirs': [ '<@(includes_to_test)', - '../src/core', ], 'sources': [ # unused_param_test.cpp is generated by the action below. @@ -481,15 +483,16 @@ 'inputs': [ '../tools/generate_includes_cpp.py', '<@(includes_to_test)', - # This causes the gyp generator on mac to fail - #'<@(paths_to_ignore)', ], 'outputs': [ - '<(INTERMEDIATE_DIR)/test_public_includes.cpp', + '<@(output_file)', + # Force the script to always run so that we pick up when files have + # been deleted. + 'filename_that_does_not_exists_but_forces_rebuild.txt', ], 'action': ['python', '../tools/generate_includes_cpp.py', '--ignore', '<(paths_to_ignore)', - '<@(_outputs)', '<@(includes_to_test)'], + '<@(output_file)', '<@(includes_to_test)'], }, ], }, |