Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(877)

Side by Side Diff: Source/core/core.gyp

Issue 325483002: Change the order of include pathes to avoid including potential staled files. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # 1 #
2 # Copyright (C) 2009 Google Inc. All rights reserved. 2 # Copyright (C) 2009 Google Inc. All rights reserved.
3 # 3 #
4 # Redistribution and use in source and binary forms, with or without 4 # Redistribution and use in source and binary forms, with or without
5 # modification, are permitted provided that the following conditions are 5 # modification, are permitted provided that the following conditions are
6 # met: 6 # met:
7 # 7 #
8 # * Redistributions of source code must retain the above copyright 8 # * Redistributions of source code must retain the above copyright
9 # notice, this list of conditions and the following disclaimer. 9 # notice, this list of conditions and the following disclaimer.
10 # * Redistributions in binary form must reproduce the above 10 # * Redistributions in binary form must reproduce the above
(...skipping 26 matching lines...) Expand all
37 'core.gypi', 37 'core.gypi',
38 '../modules/modules_generated.gypi', # FIXME: Required by <(blink_modules_ou tput_dir) below. 38 '../modules/modules_generated.gypi', # FIXME: Required by <(blink_modules_ou tput_dir) below.
39 '../platform/platform_generated.gypi', # FIXME: Required by <(blink_platform _output_dir) below. 39 '../platform/platform_generated.gypi', # FIXME: Required by <(blink_platform _output_dir) below.
40 ], 40 ],
41 41
42 'variables': { 42 'variables': {
43 'enable_wexit_time_destructors': 1, 43 'enable_wexit_time_destructors': 1,
44 44
45 'webcore_include_dirs': [ 45 'webcore_include_dirs': [
46 '..', # WebKit/Source 46 '..', # WebKit/Source
47 # Needed to include the generated binding headers.
48 '<(SHARED_INTERMEDIATE_DIR)/blink', # gen/blink
49 # FIXME: Remove these once core scripts generate qualified 47 # FIXME: Remove these once core scripts generate qualified
50 # includes correctly: http://crbug.com/380054 48 # includes correctly: http://crbug.com/380054
51 '<(blink_core_output_dir)', 49 '<(blink_core_output_dir)',
52 '<(blink_modules_output_dir)', 50 '<(blink_modules_output_dir)',
53 '<(blink_platform_output_dir)', 51 '<(blink_platform_output_dir)',
54 '<(bindings_core_v8_output_dir)', 52 '<(bindings_core_v8_output_dir)',
55 '<(bindings_modules_v8_output_dir)', 53 '<(bindings_modules_v8_output_dir)',
54 # Needed to include the generated binding headers.
55 '<(SHARED_INTERMEDIATE_DIR)/blink', # gen/blink
56 ], 56 ],
57 57
58 'conditions': [ 58 'conditions': [
59 ['OS=="android" and use_openmax_dl_fft!=0', { 59 ['OS=="android" and use_openmax_dl_fft!=0', {
60 'webcore_include_dirs': [ 60 'webcore_include_dirs': [
61 '<(DEPTH)/third_party/openmax_dl' 61 '<(DEPTH)/third_party/openmax_dl'
62 ] 62 ]
63 }], 63 }],
64 ], 64 ],
65 }, # variables 65 }, # variables
(...skipping 764 matching lines...) Expand 10 before | Expand all | Expand 10 after
830 '<(bindings_core_v8_output_dir)/V8LayerRect.h', 830 '<(bindings_core_v8_output_dir)/V8LayerRect.h',
831 '<(bindings_core_v8_output_dir)/V8LayerRectList.cpp', 831 '<(bindings_core_v8_output_dir)/V8LayerRectList.cpp',
832 '<(bindings_core_v8_output_dir)/V8LayerRectList.h', 832 '<(bindings_core_v8_output_dir)/V8LayerRectList.h',
833 ], 833 ],
834 'sources/': [ 834 'sources/': [
835 ['exclude', 'testing/js'], 835 ['exclude', 'testing/js'],
836 ], 836 ],
837 }, 837 },
838 ], # targets 838 ], # targets
839 } 839 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698