AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
046cb56c6c
skia2/gn/shared_sources.gni

92 lines
3.5 KiB
Plaintext
Raw Normal View History

Move Skia GN sources to a separate .gni file. This file will be imported by Chrome to access the sources lists. Once Chrome is updated to use this file, changes to the skia .gypi layout can be done entirely within the skia repository as long as the resulting lists produced by the new .gni file have the same name. Marks skia_for_chromium_defines as obsolete and moves the definition into the new .gni file. We can remove the .gypi file when Chrome is updated. GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2302803005 Review-Url: https://codereview.chromium.org/2302803005
2016-09-01 21:24:39 +00:00
# Copyright 2016 Google Inc.
#
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
# This file is used to shared GN source lists between the standalone Skia
# and Chrome skia build. All paths produced by this header must be
# source-absolute since it will be included in different contexts in each
# checkout.
_path_to_include = get_path_info("../include", "abspath")
_path_to_src = get_path_info("../src", "abspath")
# Core.
_core_gypi = exec_script("gypi_to_gn.py",
[
rebase_path("../gyp/core.gypi"),
"--replace=<(skia_include_path)=$_path_to_include",
"--replace=<(skia_src_path)=$_path_to_src",
],
"scope",
[ "../gyp/core.gypi" ])
skia_core_sources = _core_gypi.sources
# Effects.
_effects_gypi =
exec_script("gypi_to_gn.py",
[
rebase_path("../gyp/effects.gypi"),
"--replace=<(skia_include_path)=$_path_to_include",
"--replace=<(skia_src_path)=$_path_to_src",
],
"scope",
[ "../gyp/effects.gypi" ])
skia_effects_sources = _effects_gypi.sources
# GPU.
_gpu_gypi = exec_script("gypi_to_gn.py",
[
rebase_path("../gyp/gpu.gypi"),
"--replace=<(skia_include_path)=$_path_to_include",
"--replace=<(skia_src_path)=$_path_to_src",
],
"scope",
[ "../gyp/gpu.gypi" ])
skia_gpu_sources = _gpu_gypi.skgpu_sources
skia_null_gpu_sources = _gpu_gypi.skgpu_null_gl_sources
GN: Android Vulkan support Android's the easiest place to start supporting Vulkan, so it's up first. ndk_api becomes user-specifiable so that the Vulkan bots can kick it up to 24, the first release supporting Vulkan. The defaults remain the same: 18 for 32-bit and 21 for 64-bit, the first release supporting 64-bit. To test this, I set ndk_api=24 and skia_use_vulkan=true in GN, then $ ninja -C out dm; and droid out/dm --config vk --src gm Seems to work! Bot scripts to follow. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2336343002 Review-Url: https://codereview.chromium.org/2336343002
2016-09-14 13:12:09 +00:00
skia_vk_sources = _gpu_gypi.skgpu_vk_sources
Move Skia GN sources to a separate .gni file. This file will be imported by Chrome to access the sources lists. Once Chrome is updated to use this file, changes to the skia .gypi layout can be done entirely within the skia repository as long as the resulting lists produced by the new .gni file have the same name. Marks skia_for_chromium_defines as obsolete and moves the definition into the new .gni file. We can remove the .gypi file when Chrome is updated. GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2302803005 Review-Url: https://codereview.chromium.org/2302803005
2016-09-01 21:24:39 +00:00
# Opts.
#
# Unlike the other variables here, this is a "scope" consisting of many
# sub-lists.
skia_opts = exec_script("gypi_to_gn.py",
[
rebase_path("../gyp/opts.gypi"),
"--replace=<(skia_include_path)=$_path_to_include",
"--replace=<(skia_src_path)=$_path_to_src",
],
"scope",
[ "../gyp/opts.gypi" ])
# PDF.
_pdf_gypi = exec_script("gypi_to_gn.py",
[
rebase_path("../gyp/pdf.gypi"),
"--replace=<(skia_include_path)=$_path_to_include",
"--replace=<(skia_src_path)=$_path_to_src",
],
"scope",
[ "../gyp/pdf.gypi" ])
skia_pdf_sources = _pdf_gypi.sources
Move uils and sksl to a common sources GYP file. This is for the coalescing of sources in one GYP file to improve GN runtime. If this is successful, the other sources lists will also be merged into this one file. Inlines "../src" and "../include" for skia_source_dir and skia_include_dir. Evaluating these with GYP's variable expansion is annoying since I think another layer of nesting is required. Coding these explicitly is also more clear. This used to be required because Chromium would reference these .gypi files directly with a different path, but this no longer happens. Removes the chromium defines gypi which is no longer referenced. GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2302723005 Committed: https://skia.googlesource.com/skia/+/39f7a10a04a914384944d8bf62621144ac4eeaa3 Review-Url: https://codereview.chromium.org/2302723005
2016-09-06 19:43:55 +00:00
_sources_gypi = exec_script("gypi_to_gn.py",
GN: add a flag to implement Android_FrameworkDefs bot. This bot builds Skia with a bunch of defines to mimic the Android roll. Apparently it was supposed to be on the CQ... I'll add the GN version to it when it exists. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2343103002 Review-Url: https://codereview.chromium.org/2343103002
2016-09-16 14:45:52 +00:00
[ rebase_path("../gyp/skia_sources.gypi") ],
"scope",
[ "../gyp/skia_sources.gypi" ])
Move uils and sksl to a common sources GYP file. This is for the coalescing of sources in one GYP file to improve GN runtime. If this is successful, the other sources lists will also be merged into this one file. Inlines "../src" and "../include" for skia_source_dir and skia_include_dir. Evaluating these with GYP's variable expansion is annoying since I think another layer of nesting is required. Coding these explicitly is also more clear. This used to be required because Chromium would reference these .gypi files directly with a different path, but this no longer happens. Removes the chromium defines gypi which is no longer referenced. GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2302723005 Committed: https://skia.googlesource.com/skia/+/39f7a10a04a914384944d8bf62621144ac4eeaa3 Review-Url: https://codereview.chromium.org/2302723005
2016-09-06 19:43:55 +00:00
skia_sksl_sources = get_path_info(_sources_gypi.sksl_sources, "abspath")
skia_utils_sources = get_path_info(_sources_gypi.utils_sources, "abspath")
Move Skia GN sources to a separate .gni file. This file will be imported by Chrome to access the sources lists. Once Chrome is updated to use this file, changes to the skia .gypi layout can be done entirely within the skia repository as long as the resulting lists produced by the new .gni file have the same name. Marks skia_for_chromium_defines as obsolete and moves the definition into the new .gni file. We can remove the .gypi file when Chrome is updated. GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2302803005 Review-Url: https://codereview.chromium.org/2302803005
2016-09-01 21:24:39 +00:00
# Skia Chromium defines. These flags will be defined in chromium If these
# become 'permanent', they should be moved into Chrome's skia build file.
skia_for_chromium_defines = [ "SK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS" ]
GN: add a flag to implement Android_FrameworkDefs bot. This bot builds Skia with a bunch of defines to mimic the Android roll. Apparently it was supposed to be on the CQ... I'll add the GN version to it when it exists. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2343103002 Review-Url: https://codereview.chromium.org/2343103002
2016-09-16 14:45:52 +00:00
_android_framework_defines =
exec_script(
"gypi_to_gn.py",
[ rebase_path("../gyp/skia_for_android_framework_defines.gypi") ],
"scope",
[ "../gyp/core.gypi" ])
skia_android_framework_defines =
_android_framework_defines.skia_for_android_framework_defines
Reference in New Issue Copy Permalink