diff options
| author | bungeman <bungeman@chromium.org> | 2014-10-24 08:47:04 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-24 15:47:31 +0000 |
| commit | c04fdebda718a7bb638500309f5dc96f67761215 (patch) | |
| tree | b71f4edfb6f8b1c073f1191881c086d032c8be94 /skia | |
| parent | 00c5180f03ebd1664ca2e0b8b4170b0d30441000 (diff) | |
| download | chromium_src-c04fdebda718a7bb638500309f5dc96f67761215.zip chromium_src-c04fdebda718a7bb638500309f5dc96f67761215.tar.gz chromium_src-c04fdebda718a7bb638500309f5dc96f67761215.tar.bz2 | |
Use gypi form of blink_skia_config.
The file blink_skia_config.gyp is changing to a gypi.
This allows easier sharing between the gyp and gn build systems.
Review URL: https://codereview.chromium.org/677513003
Cr-Commit-Position: refs/heads/master@{#301105}
Diffstat (limited to 'skia')
| -rw-r--r-- | skia/BUILD.gn | 12 | ||||
| -rw-r--r-- | skia/skia_common.gypi | 7 | ||||
| -rw-r--r-- | skia/skia_library.gypi | 8 |
3 files changed, 18 insertions, 9 deletions
diff --git a/skia/BUILD.gn b/skia/BUILD.gn index 042d03d..356c6ae 100644 --- a/skia/BUILD.gn +++ b/skia/BUILD.gn @@ -11,6 +11,15 @@ if (cpu_arch == "arm") { skia_support_gpu = !is_ios skia_support_pdf = !is_ios && printing_mode != 0 +# The list of Skia defines that are to be set for blink. +gypi_blink_skia_defines = exec_script( + "//build/gypi_to_gn.py", + [ rebase_path("//third_party/WebKit/public/blink_skia_config.gypi"), + "--replace=<(skia_include_path)=//third_party/skia/include", + "--replace=<(skia_src_path)=//third_party/skia/src" ], + "scope", + [ "//third_party/WebKit/public/blink_skia_config.gypi" ]) + # The list of Skia defines that are to be set for chromium. gypi_skia_defines = exec_script( "//build/gypi_to_gn.py", @@ -98,7 +107,8 @@ config("skia_config") { "//third_party/skia/src/lazy", ] - defines = gypi_skia_defines.skia_for_chromium_defines + defines = gypi_blink_skia_defines.blink_skia_defines + defines += gypi_skia_defines.skia_for_chromium_defines defines += [ "SK_ENABLE_INST_COUNT=0", diff --git a/skia/skia_common.gypi b/skia/skia_common.gypi index 6137352..ff42074 100644 --- a/skia/skia_common.gypi +++ b/skia/skia_common.gypi @@ -6,6 +6,9 @@ # Skia build. { 'includes': [ + # blink_skia_config.gypi defines blink_skia_defines + '../third_party/WebKit/public/blink_skia_config.gypi', + # skia_for_chromium_defines.gypi defines skia_for_chromium_defines '../third_party/skia/gyp/skia_for_chromium_defines.gypi', ], @@ -156,6 +159,10 @@ 'GR_GL_IGNORE_ES3_MSAA=0', 'SK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT', + # This variable contains additional defines, specified in blink's + # blink_skia_config.gypi file. + '<@(blink_skia_defines)', + # This variable contains additional defines, specified in skia's # skia_for_chromium_defines.gypi file. '<@(skia_for_chromium_defines)', diff --git a/skia/skia_library.gypi b/skia/skia_library.gypi index 2df089e..e54b31f 100644 --- a/skia/skia_library.gypi +++ b/skia/skia_library.gypi @@ -205,14 +205,6 @@ ], }], - [ 'OS != "ios"', { - 'dependencies': [ - '../third_party/WebKit/public/blink_skia_config.gyp:blink_skia_config', - ], - 'export_dependent_settings': [ - '../third_party/WebKit/public/blink_skia_config.gyp:blink_skia_config', - ], - }], [ 'OS != "mac"', { 'sources/': [ ['exclude', '/mac/'] |