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

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

Issue 1780523003: Rename platform/fonts/CharacterData.h to avoid conflict with core/dom (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add TODO comment Created 4 years, 9 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
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 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 'xcode_settings': { 175 'xcode_settings': {
176 # Some Mac-specific parts of WebKit won't compile without having this 176 # Some Mac-specific parts of WebKit won't compile without having this
177 # prefix header injected. 177 # prefix header injected.
178 'GCC_PREFIX_HEADER': '<(DEPTH)/third_party/WebKit/Source/build/mac/Prefix. h', 178 'GCC_PREFIX_HEADER': '<(DEPTH)/third_party/WebKit/Source/build/mac/Prefix. h',
179 }, 179 },
180 'sources': [ 180 'sources': [
181 '<@(platform_files)', 181 '<@(platform_files)',
182 '<@(platform_heap_files)', 182 '<@(platform_heap_files)',
183 183
184 # Additional .cpp files from platform_generated.gyp:make_platform_generate d actions. 184 # Additional .cpp files from platform_generated.gyp:make_platform_generate d actions.
185 '<(blink_platform_output_dir)/CharacterData.cpp', 185 '<(blink_platform_output_dir)/CharacterPropertyData.cpp',
186 '<(blink_platform_output_dir)/ColorData.cpp', 186 '<(blink_platform_output_dir)/ColorData.cpp',
187 '<(blink_platform_output_dir)/FontFamilyNames.cpp', 187 '<(blink_platform_output_dir)/FontFamilyNames.cpp',
188 '<(blink_platform_output_dir)/HTTPNames.cpp', 188 '<(blink_platform_output_dir)/HTTPNames.cpp',
189 '<(blink_platform_output_dir)/RuntimeEnabledFeatures.cpp', 189 '<(blink_platform_output_dir)/RuntimeEnabledFeatures.cpp',
190 '<(blink_platform_output_dir)/RuntimeEnabledFeatures.h', 190 '<(blink_platform_output_dir)/RuntimeEnabledFeatures.h',
191 191
192 # Additional .cpp files from the protocol_sources list. 192 # Additional .cpp files from the protocol_sources list.
193 '<(blink_platform_output_dir)/inspector_protocol/Frontend.cpp', 193 '<(blink_platform_output_dir)/inspector_protocol/Frontend.cpp',
194 '<(blink_platform_output_dir)/inspector_protocol/Dispatcher.cpp', 194 '<(blink_platform_output_dir)/inspector_protocol/Dispatcher.cpp',
195 '<(blink_platform_output_dir)/inspector_protocol/TypeBuilder.cpp', 195 '<(blink_platform_output_dir)/inspector_protocol/TypeBuilder.cpp',
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
427 ['OS=="android"', { 427 ['OS=="android"', {
428 'cflags!': ['-mthumb'], 428 'cflags!': ['-mthumb'],
429 }], 429 }],
430 ], 430 ],
431 },{ # target_arch!="arm" 431 },{ # target_arch!="arm"
432 'type': 'none', 432 'type': 'none',
433 }], 433 }],
434 ], 434 ],
435 }], 435 }],
436 } 436 }
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/platform/BUILD.gn ('k') | third_party/WebKit/Source/platform/fonts/Character.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698