| OLD | NEW |
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 { | 5 { |
| 6 'targets': [ | 6 'targets': [ |
| 7 { | 7 { |
| 8 'target_name': 'skia', | 8 'target_name': 'skia', |
| 9 'type': '<(component)', | 9 'type': '<(component)', |
| 10 'variables': { | 10 'variables': { |
| (...skipping 757 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 768 | 768 |
| 769 # Temporarily disable the Skia fix in | 769 # Temporarily disable the Skia fix in |
| 770 # http://code.google.com/p/skia/source/detail?r=3037 ; enabling that | 770 # http://code.google.com/p/skia/source/detail?r=3037 ; enabling that |
| 771 # fix will require substantial rebaselining. | 771 # fix will require substantial rebaselining. |
| 772 'SK_DRAW_POS_TEXT_IGNORE_SUBPIXEL_LEFT_ALIGN_FIX', | 772 'SK_DRAW_POS_TEXT_IGNORE_SUBPIXEL_LEFT_ALIGN_FIX', |
| 773 ], | 773 ], |
| 774 'sources!': [ | 774 'sources!': [ |
| 775 '../third_party/skia/include/core/SkTypes.h', | 775 '../third_party/skia/include/core/SkTypes.h', |
| 776 ], | 776 ], |
| 777 'conditions': [ | 777 'conditions': [ |
| 778 ['order_profiling != 0', { |
| 779 'target_conditions' : [ |
| 780 ['_toolset=="target"', { |
| 781 'cflags!': [ '-finstrument-functions' ], |
| 782 }], |
| 783 ], |
| 784 }], |
| 778 # For POSIX platforms, prefer the Mutex implementation provided by Skia | 785 # For POSIX platforms, prefer the Mutex implementation provided by Skia |
| 779 # since it does not generate static initializers. | 786 # since it does not generate static initializers. |
| 780 [ 'OS == "android" or OS == "linux" or OS == "mac"', { | 787 [ 'OS == "android" or OS == "linux" or OS == "mac"', { |
| 781 'defines+': [ | 788 'defines+': [ |
| 782 'SK_USE_POSIX_THREADS', | 789 'SK_USE_POSIX_THREADS', |
| 783 ], | 790 ], |
| 784 'sources!': [ | 791 'sources!': [ |
| 785 'ext/SkThread_chrome.cc', | 792 'ext/SkThread_chrome.cc', |
| 786 ], | 793 ], |
| 787 }], | 794 }], |
| (...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1063 '..', | 1070 '..', |
| 1064 'config', | 1071 'config', |
| 1065 '../third_party/skia/include/config', | 1072 '../third_party/skia/include/config', |
| 1066 '../third_party/skia/include/core', | 1073 '../third_party/skia/include/core', |
| 1067 '../third_party/skia/include/effects', | 1074 '../third_party/skia/include/effects', |
| 1068 '../third_party/skia/include/images', | 1075 '../third_party/skia/include/images', |
| 1069 '../third_party/skia/include/utils', | 1076 '../third_party/skia/include/utils', |
| 1070 '../third_party/skia/src/core', | 1077 '../third_party/skia/src/core', |
| 1071 ], | 1078 ], |
| 1072 'conditions': [ | 1079 'conditions': [ |
| 1080 ['order_profiling != 0', { |
| 1081 'target_conditions' : [ |
| 1082 ['_toolset=="target"', { |
| 1083 'cflags!': [ '-finstrument-functions' ], |
| 1084 }], |
| 1085 ], |
| 1086 }], |
| 1073 [ 'os_posix == 1 and OS != "mac" and OS != "android" and target_arch !=
"arm"', { | 1087 [ 'os_posix == 1 and OS != "mac" and OS != "android" and target_arch !=
"arm"', { |
| 1074 'cflags': [ | 1088 'cflags': [ |
| 1075 '-msse2', | 1089 '-msse2', |
| 1076 ], | 1090 ], |
| 1077 }], | 1091 }], |
| 1078 [ 'OS == "android"', { | 1092 [ 'OS == "android"', { |
| 1079 'defines': [ | 1093 'defines': [ |
| 1080 'SK_BUILD_FOR_ANDROID_NDK', | 1094 'SK_BUILD_FOR_ANDROID_NDK', |
| 1081 ], | 1095 ], |
| 1082 }], | 1096 }], |
| 1083 [ 'target_arch != "arm"', { | 1097 [ 'target_arch != "arm"', { |
| 1084 'sources': [ | 1098 'sources': [ |
| 1085 '../third_party/skia/src/opts/SkBitmapProcState_opts_SSE2.cpp', | 1099 '../third_party/skia/src/opts/SkBitmapProcState_opts_SSE2.cpp', |
| 1086 '../third_party/skia/src/opts/SkBlitRect_opts_SSE2.cpp', | 1100 '../third_party/skia/src/opts/SkBlitRect_opts_SSE2.cpp', |
| 1087 '../third_party/skia/src/opts/SkBlitRow_opts_SSE2.cpp', | 1101 '../third_party/skia/src/opts/SkBlitRow_opts_SSE2.cpp', |
| 1088 '../third_party/skia/src/opts/SkUtils_opts_SSE2.cpp', | 1102 '../third_party/skia/src/opts/SkUtils_opts_SSE2.cpp', |
| 1089 ], | 1103 ], |
| 1090 'dependencies': [ | 1104 'dependencies': [ |
| 1091 'skia_opts_ssse3', | 1105 'skia_opts_ssse3', |
| 1092 ], | 1106 ], |
| 1093 }, | 1107 }, |
| 1094 { # arm | 1108 { # arm |
| 1095 'conditions': [ | 1109 'conditions': [ |
| 1110 ['order_profiling != 0', { |
| 1111 'target_conditions' : [ |
| 1112 ['_toolset=="target"', { |
| 1113 'cflags!': [ '-finstrument-functions' ], |
| 1114 }], |
| 1115 ], |
| 1116 }], |
| 1096 [ 'armv7 == 1', { | 1117 [ 'armv7 == 1', { |
| 1097 'defines': [ | 1118 'defines': [ |
| 1098 '__ARM_ARCH__=7', | 1119 '__ARM_ARCH__=7', |
| 1099 ], | 1120 ], |
| 1100 }], | 1121 }], |
| 1101 [ 'armv7 == 1 and arm_neon == 1', { | 1122 [ 'armv7 == 1 and arm_neon == 1', { |
| 1102 'defines': [ | 1123 'defines': [ |
| 1103 '__ARM_HAVE_NEON', | 1124 '__ARM_HAVE_NEON', |
| 1104 ], | 1125 ], |
| 1105 'cflags': [ | 1126 'cflags': [ |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1164 '../third_party/skia/include/config', | 1185 '../third_party/skia/include/config', |
| 1165 '../third_party/skia/include/core', | 1186 '../third_party/skia/include/core', |
| 1166 '../third_party/skia/src/core', | 1187 '../third_party/skia/src/core', |
| 1167 ], | 1188 ], |
| 1168 'conditions': [ | 1189 'conditions': [ |
| 1169 [ 'OS in ["linux", "freebsd", "openbsd", "solaris"]', { | 1190 [ 'OS in ["linux", "freebsd", "openbsd", "solaris"]', { |
| 1170 'cflags': [ | 1191 'cflags': [ |
| 1171 '-mssse3', | 1192 '-mssse3', |
| 1172 ], | 1193 ], |
| 1173 }], | 1194 }], |
| 1195 ['order_profiling != 0', { |
| 1196 'target_conditions' : [ |
| 1197 ['_toolset=="target"', { |
| 1198 'cflags!': [ '-finstrument-functions' ], |
| 1199 }], |
| 1200 ], |
| 1201 }], |
| 1174 # TODO: when ninja/make understand | 1202 # TODO: when ninja/make understand |
| 1175 # GCC_ENABLE_SUPPLEMENTAL_SSE3_INSTRUCTIONS, set that to YES here | 1203 # GCC_ENABLE_SUPPLEMENTAL_SSE3_INSTRUCTIONS, set that to YES here |
| 1176 # instead of stepping on OTHER_CFLAGS. | 1204 # instead of stepping on OTHER_CFLAGS. |
| 1177 [ 'OS in ["mac"]', { | 1205 [ 'OS in ["mac"]', { |
| 1178 'xcode_settings': { | 1206 'xcode_settings': { |
| 1179 'OTHER_CFLAGS': ['-mssse3',], | 1207 'OTHER_CFLAGS': ['-mssse3',], |
| 1180 }, | 1208 }, |
| 1181 }], | 1209 }], |
| 1182 [ 'OS == "win"', { | 1210 [ 'OS == "win"', { |
| 1183 'include_dirs': [ | 1211 'include_dirs': [ |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1247 ], | 1275 ], |
| 1248 'include_dirs': [ | 1276 'include_dirs': [ |
| 1249 '..', | 1277 '..', |
| 1250 ], | 1278 ], |
| 1251 'sources': [ | 1279 'sources': [ |
| 1252 'ext/image_operations_bench.cc', | 1280 'ext/image_operations_bench.cc', |
| 1253 ], | 1281 ], |
| 1254 }, | 1282 }, |
| 1255 ], | 1283 ], |
| 1256 } | 1284 } |
| OLD | NEW |