| OLD | NEW |
| 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2013 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 import("//build/config/features.gni") | 5 import("//build/config/features.gni") |
| 6 import("//build/config/ui.gni") | 6 import("//build/config/ui.gni") |
| 7 import("//testing/test.gni") | 7 import("//testing/test.gni") |
| 8 | 8 |
| 9 if (current_cpu == "arm") { | 9 if (current_cpu == "arm") { |
| 10 import("//build/config/arm.gni") | 10 import("//build/config/arm.gni") |
| (...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 105 "//third_party/skia/include/config", | 105 "//third_party/skia/include/config", |
| 106 "//third_party/skia/include/core", | 106 "//third_party/skia/include/core", |
| 107 "//third_party/skia/include/effects", | 107 "//third_party/skia/include/effects", |
| 108 "//third_party/skia/include/images", | 108 "//third_party/skia/include/images", |
| 109 "//third_party/skia/include/lazy", | 109 "//third_party/skia/include/lazy", |
| 110 "//third_party/skia/include/pathops", | 110 "//third_party/skia/include/pathops", |
| 111 "//third_party/skia/include/pdf", | 111 "//third_party/skia/include/pdf", |
| 112 "//third_party/skia/include/pipe", | 112 "//third_party/skia/include/pipe", |
| 113 "//third_party/skia/include/ports", | 113 "//third_party/skia/include/ports", |
| 114 "//third_party/skia/include/utils", | 114 "//third_party/skia/include/utils", |
| 115 # TODO(dsinclair): Right way to use //third_party/freetype? |
| 116 "//third_party/freetype/include", |
| 115 ] | 117 ] |
| 116 | 118 |
| 117 defines = [] | 119 defines = [] |
| 118 | 120 |
| 119 if (skia_support_gpu) { | 121 if (skia_support_gpu) { |
| 120 include_dirs += [ | 122 include_dirs += [ |
| 121 "//third_party/skia/include/gpu", | 123 "//third_party/skia/include/gpu", |
| 122 "//third_party/skia/src/gpu", | 124 "//third_party/skia/src/gpu", |
| 123 ] | 125 ] |
| 124 defines += [ "SK_SUPPORT_GPU=1" ] | 126 defines += [ "SK_SUPPORT_GPU=1" ] |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 234 "/wd4748", # compiler will disable optimizations if a function has inline | 236 "/wd4748", # compiler will disable optimizations if a function has inline |
| 235 # assembly code contains flow control(jmp or jcc) statements. | 237 # assembly code contains flow control(jmp or jcc) statements. |
| 236 | 238 |
| 237 "/wd4800", # forcing value to bool 'true/false'(assigning int to bool). | 239 "/wd4800", # forcing value to bool 'true/false'(assigning int to bool). |
| 238 ] | 240 ] |
| 239 } | 241 } |
| 240 } | 242 } |
| 241 | 243 |
| 242 component("skia") { | 244 component("skia") { |
| 243 sources = [ | 245 sources = [ |
| 244 # Chrome sources. | 246 # PDFium sources. |
| 245 "config/SkUserConfig.h", | 247 "config/SkUserConfig.h", |
| 246 "ext/google_logging.cc", | 248 "ext/google_logging.cc", |
| 247 ] | 249 ] |
| 248 | 250 |
| 249 # The skia gypi values are relative to the skia_dir, so we need to rebase. | 251 # The skia gypi values are relative to the skia_dir, so we need to rebase. |
| 250 sources += gypi_skia_core.sources | 252 sources += gypi_skia_core.sources |
| 251 sources += gypi_skia_effects.sources | 253 sources += gypi_skia_effects.sources |
| 252 sources += gypi_skia_utils.sources | 254 sources += gypi_skia_utils.sources |
| 253 sources += gypi_values.skia_library_sources | 255 sources += gypi_values.skia_library_sources |
| 254 | 256 |
| (...skipping 13 matching lines...) Expand all Loading... |
| 268 # Remove unused util files include in utils.gypi | 270 # Remove unused util files include in utils.gypi |
| 269 sources -= [ | 271 sources -= [ |
| 270 "//third_party/skia/src/utils/SkBoundaryPatch.cpp", | 272 "//third_party/skia/src/utils/SkBoundaryPatch.cpp", |
| 271 "//third_party/skia/src/utils/SkCamera.cpp", | 273 "//third_party/skia/src/utils/SkCamera.cpp", |
| 272 "//third_party/skia/src/utils/SkDumpCanvas.cpp", | 274 "//third_party/skia/src/utils/SkDumpCanvas.cpp", |
| 273 "//third_party/skia/src/utils/SkFrontBufferedStream.cpp", | 275 "//third_party/skia/src/utils/SkFrontBufferedStream.cpp", |
| 274 "//third_party/skia/src/utils/SkInterpolator.cpp", | 276 "//third_party/skia/src/utils/SkInterpolator.cpp", |
| 275 "//third_party/skia/src/utils/SkLayer.cpp", | 277 "//third_party/skia/src/utils/SkLayer.cpp", |
| 276 "//third_party/skia/src/utils/SkMeshUtils.cpp", | 278 "//third_party/skia/src/utils/SkMeshUtils.cpp", |
| 277 "//third_party/skia/src/utils/SkNinePatch.cpp", | 279 "//third_party/skia/src/utils/SkNinePatch.cpp", |
| 278 "//third_party/skia/src/utils/SkOSFile.cpp", | |
| 279 "//third_party/skia/src/utils/SkParsePath.cpp", | 280 "//third_party/skia/src/utils/SkParsePath.cpp", |
| 280 | 281 |
| 281 #testing | 282 #testing |
| 282 "//third_party/skia/src/fonts/SkGScalerContext.cpp", | 283 "//third_party/skia/src/fonts/SkGScalerContext.cpp", |
| 283 ] | 284 ] |
| 284 | 285 |
| 285 if (is_win) { | 286 if (is_win) { |
| 286 sources -= [ | 287 sources -= [ |
| 287 # Keeping _win.cpp | 288 # Keeping _win.cpp |
| 288 "//third_party/skia/src/utils/SkThreadUtils_pthread.cpp", | 289 "//third_party/skia/src/utils/SkThreadUtils_pthread.cpp", |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 335 | 336 |
| 336 if (!is_linux) { | 337 if (!is_linux) { |
| 337 sources -= [ | 338 sources -= [ |
| 338 "//third_party/skia/src/fonts/SkFontMgr_fontconfig.cpp", | 339 "//third_party/skia/src/fonts/SkFontMgr_fontconfig.cpp", |
| 339 "//third_party/skia/src/ports/SkFontConfigInterface_direct.cpp", | 340 "//third_party/skia/src/ports/SkFontConfigInterface_direct.cpp", |
| 340 "//third_party/skia/src/ports/SkFontConfigInterface_direct_factory.cpp", | 341 "//third_party/skia/src/ports/SkFontConfigInterface_direct_factory.cpp", |
| 341 "//third_party/skia/src/ports/SkFontHost_fontconfig.cpp", | 342 "//third_party/skia/src/ports/SkFontHost_fontconfig.cpp", |
| 342 ] | 343 ] |
| 343 } | 344 } |
| 344 | 345 |
| 345 # Add the files for the SkFontMgr_Android. This is used to emulate android | |
| 346 # fonts on linux. See content/zygote/zygote_main_linux.cc | |
| 347 if (is_linux) { | |
| 348 sources += [ | |
| 349 "//third_party/skia/src/ports/SkFontMgr_android.cpp", | |
| 350 "//third_party/skia/src/ports/SkFontMgr_android_parser.cpp", | |
| 351 ] | |
| 352 } | |
| 353 | |
| 354 if (!is_linux && !is_android) { | 346 if (!is_linux && !is_android) { |
| 355 sources -= [ | 347 sources -= [ |
| 356 "//third_party/skia/src/ports/SkFontHost_FreeType.cpp", | 348 "//third_party/skia/src/ports/SkFontHost_FreeType.cpp", |
| 357 "//third_party/skia/src/ports/SkFontHost_FreeType_common.cpp", | 349 "//third_party/skia/src/ports/SkFontHost_FreeType_common.cpp", |
| 358 ] | 350 ] |
| 359 } | 351 } |
| 360 | 352 |
| 361 if (is_clang && !is_nacl) { | 353 if (is_clang && !is_nacl) { |
| 362 # Skia won't compile with some of the more strict clang warnings. | 354 # Skia won't compile with some of the more strict clang warnings. |
| 363 # e.g. it does: | 355 # e.g. it does: |
| 364 # SkASSERT(!"sk_out_of_memory"); | 356 # SkASSERT(!"sk_out_of_memory"); |
| 365 configs -= [ "//build/config/clang:extra_warnings" ] | 357 configs -= [ "//build/config/clang:extra_warnings" ] |
| 366 } | 358 } |
| 367 | 359 |
| 368 configs -= [ "//build/config/compiler:chromium_code" ] | 360 configs -= [ "//build/config/compiler:chromium_code" ] |
| 369 configs += [ | 361 configs += [ |
| 370 ":skia_config", | 362 ":skia_config", |
| 371 ":skia_library_config", | 363 ":skia_library_config", |
| 372 "//build/config/compiler:no_chromium_code", | 364 "//build/config/compiler:no_chromium_code", |
| 373 ] | 365 ] |
| 374 public_configs = [ ":skia_config" ] | 366 public_configs = [ ":skia_config" ] |
| 375 | 367 |
| 376 deps = [ | 368 deps = [ |
| 377 ":skia_opts", | 369 ":skia_opts", |
| 378 "../third_party:fx_zlib", | 370 "../third_party:fx_zlib", |
| 379 ] | 371 ] |
| 380 | 372 |
| 381 if (is_linux) { | 373 if (is_linux) { |
| 382 if (use_pango) { | |
| 383 configs += [ "//build/config/linux/pangocairo" ] | |
| 384 } | |
| 385 deps += [ | 374 deps += [ |
| 386 "//build/linux:fontconfig", | |
| 387 "//build/linux:freetype2", | |
| 388 | |
| 389 # "//third_party/expat", | |
| 390 "//third_party/icu:icuuc", | 375 "//third_party/icu:icuuc", |
| 391 ] | 376 ] |
| 392 } | 377 } |
| 393 | 378 |
| 394 if (is_android) { | 379 if (is_android) { |
| 395 set_sources_assignment_filter([]) | 380 set_sources_assignment_filter([]) |
| 396 set_sources_assignment_filter(sources_assignment_filter) | 381 set_sources_assignment_filter(sources_assignment_filter) |
| 397 deps += [ | 382 deps += [ |
| 398 "//third_party/android_tools:cpu_features", | 383 "//third_party/android_tools:cpu_features", |
| 399 "//third_party/expat", | 384 "//third_party/expat", |
| (...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 568 | 553 |
| 569 configs -= [ "//build/config/compiler:chromium_code" ] | 554 configs -= [ "//build/config/compiler:chromium_code" ] |
| 570 configs += [ | 555 configs += [ |
| 571 ":skia_config", | 556 ":skia_config", |
| 572 ":skia_library_config", | 557 ":skia_library_config", |
| 573 "//build/config/compiler:no_chromium_code", | 558 "//build/config/compiler:no_chromium_code", |
| 574 ] | 559 ] |
| 575 | 560 |
| 576 visibility = [ ":skia" ] | 561 visibility = [ ":skia" ] |
| 577 } | 562 } |
| OLD | NEW |