0

Move gn secondary_source to the build/ directory

It's a goodness to sequester build configuration in the build/
directory. The gn secondary_source stuff was under tools/gn for
historical reasons, so move it to a more appropriate place.

BUG=None
TEST=do a gn build of base_unittests, run said unittests.

Review URL: https://codereview.chromium.org/340153004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@278355 0039d316-1c4b-4281-b951-d872f2087c98
This commit is contained in:
cmasone@chromium.org
2014-06-19 13:14:26 +00:00
parent b055c2f97e
commit 26688b86ea
24 changed files with 14 additions and 14 deletions
.gn
android_webview/tools
build/secondary
chrome
testing
third_party
WebKit
Source
platform
wtf
android_tools
angle
flac
freetype
icu
leveldatabase
libjpeg_turbo
nss
ots
sfntly
speex
trace-viewer
tools
ui
tools

2
.gn

@ -5,4 +5,4 @@
buildconfig = "//build/config/BUILDCONFIG.gn"
# The secondary source root is a parallel directory tree where
secondary_source = "//tools/gn/secondary/"
secondary_source = "//build/secondary/"

@ -230,7 +230,7 @@ def _FindThirdPartyDirs():
os.path.join('third_party', 'widevine'),
# third_party directories in this tree aren't actually third party, but
# provide a way to shadow experimental buildfiles into those directories.
os.path.join('tools', 'gn', 'secondary'),
os.path.join('build', 'secondary'),
# Not shipped, Chromium code
os.path.join('tools', 'swarming_client'),
]

@ -1,4 +1,4 @@
# Copyright (c) 2013 The Chromium Authors. All rights reserved.
# Copyright 2014 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

@ -1,4 +1,4 @@
# Copyright (c) 2013 The Chromium Authors. All rights reserved.
# Copyright 2014 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

@ -1,4 +1,4 @@
# Copyright (c) 2013 The Chromium Authors. All rights reserved.
# Copyright 2014 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

@ -1,4 +1,4 @@
# Copyright 2013 The Chromium Authors. All rights reserved.
# Copyright 2014 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

@ -281,7 +281,7 @@ if (false) {
deps = [ ":copy_angle_commit_h", ":copy_commit_h" ]
}
hardcoded_commit = [ "//tools/gn/secondary/third_party/angle/angle_commit.h" ]
hardcoded_commit = [ "//build/secondary/third_party/angle/angle_commit.h" ]
copy("copy_angle_commit_h") {
sources = hardcoded_commit
outputs = [ "$root_gen_dir/angle_commit.h" ]

@ -1,4 +1,4 @@
# Copyright (c) 2012 The Chromium Authors. All rights reserved.
# Copyright 2014 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

@ -1,4 +1,4 @@
# Copyright (c) 2013 The Chromium Authors. All rights reserved.
# Copyright 2014 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

@ -1,4 +1,4 @@
# Copyright (c) 2013 The Chromium Authors. All rights reserved.
# Copyright 2014 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

@ -1,4 +1,4 @@
# Copyright (c) 2013 The Chromium Authors. All rights reserved.
# Copyright 2014 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

@ -1,4 +1,4 @@
# Copyright (c) 2013 The Chromium Authors. All rights reserved.
# Copyright 2014 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

@ -1,4 +1,4 @@
# Copyright (c) 2013 The Chromium Authors. All rights reserved.
# Copyright 2014 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

@ -35,6 +35,7 @@ PRUNE_PATHS = set([
os.path.join('third_party','valgrind'),
# Used for development and test, not in the shipping product.
os.path.join('build','secondary'),
os.path.join('third_party','bison'),
os.path.join('third_party','blanketjs'),
os.path.join('third_party','cygwin'),
@ -54,7 +55,6 @@ PRUNE_PATHS = set([
os.path.join('third_party','qunit'),
os.path.join('third_party','sinonjs'),
os.path.join('third_party','syzygy'),
os.path.join('tools','gn'),
# Chromium code in third_party.
os.path.join('third_party','fuzzymatch'),