Skip to content

Commit

Permalink
Follow-up to 'Default to "out" everywhere for the build directory'
Browse files Browse the repository at this point in the history
I just noticed that there was a constant and a TODO note that
I meant to remove in a previous CL: https://crrev.com/c/546938/

Change-Id: Ib64f04407ecef335dbd1e4007ebc5a94971a5233
Reviewed-on: https://chromium-review.googlesource.com/553523
Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Commit-Queue: Quinten Yearsley <qyearsley@chromium.org>
Cr-Commit-Position: refs/heads/master@{#483283}
  • Loading branch information
Quinten Yearsley authored and Commit Bot committed Jun 29, 2017
1 parent 456585e commit f35c8a8
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -163,10 +163,7 @@ def _check_configuration_and_target(host, options):

def _read_configuration_from_gn(fs, options):
"""Returns the configuration to used based on args.gn, if possible."""

# TODO(qyearsley): Default to 'out' everywhere.
build_directory = getattr(options, 'build_directory', 'out')

target = options.target
finder = PathFinder(fs)
path = fs.join(finder.chromium_base(), build_directory, target, 'args.gn')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,6 @@ class LinuxPort(base.Port):
FALLBACK_PATHS = {}
FALLBACK_PATHS['trusty'] = ['linux'] + win.WinPort.latest_platform_fallback_path()

DEFAULT_BUILD_DIRECTORIES = ('out',)

BUILD_REQUIREMENTS_URL = 'https://chromium.googlesource.com/chromium/src/+/master/docs/linux_build_instructions.md'

XVFB_START_TIMEOUT = 5.0 # Wait up to 5 seconds for Xvfb to start.
Expand Down

0 comments on commit f35c8a8

Please sign in to comment.