Skip to content

Commit

Permalink
Move build_with_chromium GN variable to DEPS file.
Browse files Browse the repository at this point in the history
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 <jmadill@chromium.org>
Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
Cr-Commit-Position: refs/heads/master@{#563160}
  • Loading branch information
Edward Lemur authored and Commit Bot committed May 31, 2018
1 parent 11d5f36 commit 88678b8
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
6 changes: 6 additions & 0 deletions DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -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
Expand Down
4 changes: 1 addition & 3 deletions build_overrides/build.gni
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit 88678b8

Please sign in to comment.