From a0bd3fee55ea0538ac66bd9d20b06df766941f53 Mon Sep 17 00:00:00 2001 From: Scott Graham Date: Mon, 18 Dec 2017 16:41:20 -0800 Subject: [PATCH] fuchsia: Support referencing the Fuchsia tree's third_party/zlib This renames the "chromium" configuration of zlib to "external". What it really means is that zlib lives in //third_party/zlib, which happens to be where both Chromium and Fuchsia put it, with moderately similar build files. Bug: crashpad:79, crashpad:196 Change-Id: I380c106ec1f97471b2354166f5cf92885196e1b8 Reviewed-on: https://chromium-review.googlesource.com/833095 Reviewed-by: Mark Mentovai Commit-Queue: Scott Graham --- third_party/zlib/BUILD.gn | 10 +++++----- third_party/zlib/zlib_crashpad.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/third_party/zlib/BUILD.gn b/third_party/zlib/BUILD.gn index d93ac5e6..6edddfb9 100644 --- a/third_party/zlib/BUILD.gn +++ b/third_party/zlib/BUILD.gn @@ -14,8 +14,8 @@ import("../../build/crashpad_dependencies.gni") -if (crashpad_is_in_chromium) { - zlib_source = "chromium" +if (crashpad_is_in_chromium || crashpad_is_in_fuchsia) { + zlib_source = "external" } else if (!is_win && !is_fuchsia) { zlib_source = "system" } else { @@ -23,8 +23,8 @@ if (crashpad_is_in_chromium) { } config("zlib_config") { - if (zlib_source == "chromium") { - defines = [ "CRASHPAD_ZLIB_SOURCE_CHROMIUM" ] + if (zlib_source == "external") { + defines = [ "CRASHPAD_ZLIB_SOURCE_EXTERNAL" ] } else if (zlib_source == "system") { defines = [ "CRASHPAD_ZLIB_SOURCE_SYSTEM" ] } else if (zlib_source == "embedded") { @@ -33,7 +33,7 @@ config("zlib_config") { } } -if (zlib_source == "chromium") { +if (zlib_source == "external") { group("zlib") { public_configs = [ ":zlib_config" ] public_deps = [ diff --git a/third_party/zlib/zlib_crashpad.h b/third_party/zlib/zlib_crashpad.h index 5df7f659..d3a23861 100644 --- a/third_party/zlib/zlib_crashpad.h +++ b/third_party/zlib/zlib_crashpad.h @@ -19,7 +19,7 @@ // available at any other location in the source tree. It will #include the // proper depending on how the build has been configured. -#if defined(CRASHPAD_ZLIB_SOURCE_CHROMIUM) +#if defined(CRASHPAD_ZLIB_SOURCE_EXTERNAL) #include "third_party/zlib/zlib.h" #elif defined(CRASHPAD_ZLIB_SOURCE_SYSTEM) #include