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

Side by Side Diff: Source/platform/blink_platform.gyp

Issue 329253005: Qualify the generated includes in platform. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix Mac build 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 | « Source/platform/BUILD.gn ('k') | Source/platform/blink_platform_tests.gyp » ('j') | 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) 2013 Google Inc. All rights reserved. 2 # Copyright (C) 2013 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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 ], 51 ],
52 }, 52 },
53 'export_dependent_settings': [ 53 'export_dependent_settings': [
54 '<(DEPTH)/skia/skia.gyp:skia', 54 '<(DEPTH)/skia/skia.gyp:skia',
55 ], 55 ],
56 'defines': [ 56 'defines': [
57 'BLINK_COMMON_IMPLEMENTATION=1', 57 'BLINK_COMMON_IMPLEMENTATION=1',
58 'INSIDE_BLINK', 58 'INSIDE_BLINK',
59 ], 59 ],
60 'include_dirs': [ 60 'include_dirs': [
61 # FIXME: Remove these once scripts generate qualified 61 '<(SHARED_INTERMEDIATE_DIR)/blink',
62 # includes correctly: http://crbug.com/380054
63 '<(blink_platform_output_dir)',
64 ], 62 ],
65 'sources': [ 63 'sources': [
66 'exported/WebCString.cpp', 64 'exported/WebCString.cpp',
67 'exported/WebString.cpp', 65 'exported/WebString.cpp',
68 'exported/WebCommon.cpp', 66 'exported/WebCommon.cpp',
69 ], 67 ],
70 }, 68 },
71 { 69 {
72 'target_name': 'blink_heap_asm_stubs', 70 'target_name': 'blink_heap_asm_stubs',
73 'type': 'static_library', 71 'type': 'static_library',
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 '<(DEPTH)/url/url.gyp:url_lib', 208 '<(DEPTH)/url/url.gyp:url_lib',
211 '<(DEPTH)/third_party/iccjpeg/iccjpeg.gyp:iccjpeg', 209 '<(DEPTH)/third_party/iccjpeg/iccjpeg.gyp:iccjpeg',
212 '<(libjpeg_gyp_path):libjpeg', 210 '<(libjpeg_gyp_path):libjpeg',
213 ], 211 ],
214 'defines': [ 212 'defines': [
215 'BLINK_PLATFORM_IMPLEMENTATION=1', 213 'BLINK_PLATFORM_IMPLEMENTATION=1',
216 'INSIDE_BLINK', 214 'INSIDE_BLINK',
217 ], 215 ],
218 'include_dirs': [ 216 'include_dirs': [
219 '<(angle_path)/include', 217 '<(angle_path)/include',
220 '<(blink_platform_output_dir)', 218 '<(SHARED_INTERMEDIATE_DIR)/blink',
221 ], 219 ],
222 'xcode_settings': { 220 'xcode_settings': {
223 # Some Mac-specific parts of WebKit won't compile without having this 221 # Some Mac-specific parts of WebKit won't compile without having this
224 # prefix header injected. 222 # prefix header injected.
225 # FIXME: make this a first-class setting. 223 # FIXME: make this a first-class setting.
226 'GCC_PREFIX_HEADER': '../core/WebCorePrefixMac.h', 224 'GCC_PREFIX_HEADER': '../core/WebCorePrefixMac.h',
227 }, 225 },
228 'sources': [ 226 'sources': [
229 '<@(platform_files)', 227 '<@(platform_files)',
230 '<@(platform_heap_files)', 228 '<@(platform_heap_files)',
(...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after
482 ['OS=="android"', { 480 ['OS=="android"', {
483 'cflags!': ['-mthumb'], 481 'cflags!': ['-mthumb'],
484 }], 482 }],
485 ], 483 ],
486 },{ # target_arch!="arm" 484 },{ # target_arch!="arm"
487 'type': 'none', 485 'type': 'none',
488 }], 486 }],
489 ], 487 ],
490 }], 488 }],
491 } 489 }
OLDNEW
« no previous file with comments | « Source/platform/BUILD.gn ('k') | Source/platform/blink_platform_tests.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698