From 88678b826028a2c25f98fbdcd290bbd98e87af05 Mon Sep 17 00:00:00 2001 From: Edward Lemur Date: Thu, 31 May 2018 06:01:38 +0000 Subject: [PATCH] Move build_with_chromium GN variable to DEPS file. This way, DEPS files can also know whether they're building with chromium or not. Bug: 782846 Change-Id: I43885e2b9aa1e72b612c17569a23d47e74835273 Reviewed-on: https://chromium-review.googlesource.com/1077619 Reviewed-by: Jamie Madill Reviewed-by: Dirk Pranke Commit-Queue: Edward Lesmes Cr-Commit-Position: refs/heads/master@{#563160} --- DEPS | 6 ++++++ build_overrides/build.gni | 4 +--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/DEPS b/DEPS index c0f836625fbaa7..d50875776aacdd 100644 --- a/DEPS +++ b/DEPS @@ -28,6 +28,7 @@ gclient_gn_args_file = 'src/build/config/gclient_args.gni' gclient_gn_args = [ + 'build_with_chromium', 'checkout_android', 'checkout_android_native_support', 'checkout_libaom', @@ -37,6 +38,11 @@ gclient_gn_args = [ vars = { + # Variable that can be used to support multiple build scenarios, like having + # Chromium specific targets in a client project's GN file or sync dependencies + # conditionally etc. + 'build_with_chromium': True, + # By default, we should check out everything needed to run on the main # chromium waterfalls. This var can be also be set to "small", in order # to skip things are not strictly needed to build chromium for development diff --git a/build_overrides/build.gni b/build_overrides/build.gni index 590729df9e7276..f18c9d855eb56e 100644 --- a/build_overrides/build.gni +++ b/build_overrides/build.gni @@ -2,9 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -# Variable that can be used to support multiple build scenarios, like having -# Chromium specific targets in a client project's GN file etc. -build_with_chromium = true +import("//build/config/gclient_args.gni") # Uncomment these to specify a different NDK location and version in # non-Chromium builds.