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

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

Issue 42313002: Move Color.*, DashArray and DrawLooper to Source/platform/ (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: correct patch set 1 mistake Created 7 years, 1 month 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 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 'INSIDE_BLINK', 84 'INSIDE_BLINK',
85 ], 85 ],
86 'include_dirs': [ 86 'include_dirs': [
87 '<(DEPTH)/third_party/angle_dx11/include', 87 '<(DEPTH)/third_party/angle_dx11/include',
88 ], 88 ],
89 'sources': [ 89 'sources': [
90 '<@(platform_files)', 90 '<@(platform_files)',
91 91
92 # Additional .cpp files from platform_derived_sources.gyp:make_platform_de rived_sources actions. 92 # Additional .cpp files from platform_derived_sources.gyp:make_platform_de rived_sources actions.
93 '<(SHARED_INTERMEDIATE_DIR)/blink/FontFamilyNames.cpp', 93 '<(SHARED_INTERMEDIATE_DIR)/blink/FontFamilyNames.cpp',
94 '<(SHARED_INTERMEDIATE_DIR)/blink/ColorData.cpp',
94 ], 95 ],
95 # Disable c4267 warnings until we fix size_t to int truncations. 96 # Disable c4267 warnings until we fix size_t to int truncations.
96 # Disable c4724 warnings which is generated in VS2012 due to improper 97 # Disable c4724 warnings which is generated in VS2012 due to improper
97 # compiler optimizations, see crbug.com/237063 98 # compiler optimizations, see crbug.com/237063
98 'msvs_disabled_warnings': [ 4267, 4334, 4724 ], 99 'msvs_disabled_warnings': [ 4267, 4334, 4724 ],
99 'conditions': [ 100 'conditions': [
100 ['OS=="mac"', { 101 ['OS=="mac"', {
101 'link_settings': { 102 'link_settings': {
102 'libraries': [ 103 'libraries': [
103 '$(SDKROOT)/System/Library/Frameworks/Accelerate.framework', 104 '$(SDKROOT)/System/Library/Frameworks/Accelerate.framework',
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 'include_dirs': [ 138 'include_dirs': [
138 '<(DEPTH)/third_party/openmax_dl', 139 '<(DEPTH)/third_party/openmax_dl',
139 ], 140 ],
140 'dependencies': [ 141 'dependencies': [
141 '<(DEPTH)/third_party/openmax_dl/dl/dl.gyp:openmax_dl', 142 '<(DEPTH)/third_party/openmax_dl/dl/dl.gyp:openmax_dl',
142 ], 143 ],
143 }], 144 }],
144 ], 145 ],
145 }], 146 }],
146 } 147 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698