diff options
| -rw-r--r-- | DEPS | 1 | ||||
| -rw-r--r-- | docs/getting-started.md | 4 | ||||
| -rw-r--r-- | skia/BUILD.gn | 6 | ||||
| -rw-r--r-- | skia/config/SkUserConfig.h | 2 |
4 files changed, 6 insertions, 7 deletions
@@ -144,7 +144,6 @@ specific_include_rules = { } hooks = [ - # Pull GN binaries. This needs to be before running GYP below. { 'name': 'gn_win', 'action': [ 'download_from_google_storage', diff --git a/docs/getting-started.md b/docs/getting-started.md index 8d218e2e4b..8d46a74082 100644 --- a/docs/getting-started.md +++ b/docs/getting-started.md @@ -12,8 +12,8 @@ You will need the PDFium library on your computer. You can see the *** note You must compile PDFium without both V8 and XFA support for the examples -here to work. V8 can be compiled out by providing -`GYP_DEFINES="pdf_enable_v8=0 pdf_enable_xfa=0" build/gyp_pdfium`. +here to work. V8 can be disabled by setting `pdf_enable_v8 = false` in the +GN args. See the [V8 Getting Started][pdfium-v8] guide for how to initialize PDFium when V8 is compiled into the binary. diff --git a/skia/BUILD.gn b/skia/BUILD.gn index a129ef9d59..74546ebfc0 100644 --- a/skia/BUILD.gn +++ b/skia/BUILD.gn @@ -183,7 +183,7 @@ component("skia") { "ext/google_logging.cc", ] - # The skia gypi values are relative to the skia_dir, so we need to rebase. + # The skia sources values are relative to the skia_dir, so we need to rebase. sources += skia_core_sources sources += skia_effects_sources sources += skia_sksl_sources @@ -235,7 +235,7 @@ component("skia") { sources += skia_null_gpu_sources } - # Remove unused util files include in utils.gypi + # Remove unused util files include in utils.gni sources -= [ "//third_party/skia/src/utils/SkCamera.cpp", "//third_party/skia/src/utils/SkDumpCanvas.cpp", @@ -497,7 +497,7 @@ source_set("skia_opts") { cflags += [ "-fomit-frame-pointer" ] sources = skia_opts.none_sources } else { - assert(false, "Need to port cpu specific stuff from skia_library_opts.gyp") + assert(false, "Need to port cpu specific stuff from gn/BUILDCONFIG.gn") } if (is_android && !is_debug) { diff --git a/skia/config/SkUserConfig.h b/skia/config/SkUserConfig.h index e09a2351b3..bb9862b564 100644 --- a/skia/config/SkUserConfig.h +++ b/skia/config/SkUserConfig.h @@ -235,7 +235,7 @@ SK_API void SkDebugf_FileLine(const char* file, #define SK_SUPPORT_LEGACY_EVAL_CUBIC #endif -///////////////////////// Imported from BUILD.gn and skia_common.gypi +///////////////////////// Imported from BUILD.gn /* In some places Skia can use static initializers for global initialization, * or fall back to lazy runtime initialization. Chrome always wants the latter. |