Skip to content

Commit

Permalink
Remove GN GYP generator.
Browse files Browse the repository at this point in the history
This removes the GYP generator code and associated build stuff.

R=scottmg@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@259983 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
brettw@chromium.org committed Mar 27, 2014
1 parent fe14261 commit 1539320
Show file tree
Hide file tree
Showing 60 changed files with 4 additions and 2,337 deletions.
3 changes: 0 additions & 3 deletions base/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import("//build/config/ui.gni")

component("base") {
external = true
sources = [
"../build/build_config.h",
"third_party/dmg_fp/dmg_fp.h",
Expand Down Expand Up @@ -842,7 +841,6 @@ component("base") {
# library. Note that this library cannot depend on base because base depends on
# base_static.
static_library("base_static") {
external = true
sources = [
"base_switches.cc",
"base_switches.h",
Expand All @@ -852,7 +850,6 @@ static_library("base_static") {
}

component("base_i18n") {
external = true
sources = [
"i18n/base_i18n_export.h",
"i18n/bidi_line_iterator.cc",
Expand Down
1 change: 0 additions & 1 deletion base/allocator/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
# found in the LICENSE file.

static_library("allocator_extension_thunks") {
external = true
sources = [
"allocator_extension_thunks.cc",
"allocator_extension_thunks.h",
Expand Down
3 changes: 0 additions & 3 deletions base/test/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import("//build/config/ui.gni")

static_library("test_support_base") {
external = true
sources = [
"expectations/expectation.cc",
"expectations/expectation.h",
Expand Down Expand Up @@ -125,7 +124,6 @@ config("perf_test_config") {
}

static_library("test_support_perf") {
external = true
sources = [
"run_all_perftests.cc",
]
Expand All @@ -142,7 +140,6 @@ static_library("test_support_perf") {
}

static_library("run_all_unittests") {
external = true
sources = [
"run_all_unittests.cc",
]
Expand Down
1 change: 0 additions & 1 deletion base/third_party/nspr/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
# found in the LICENSE file.

static_library("nspr") {
external = true
sources = [
"prtime.cc",
"prtime.h",
Expand Down
1 change: 0 additions & 1 deletion base/third_party/symbolize/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
# found in the LICENSE file.

static_library("symbolize") {
external = true
sources = [
"config.h",
"demangle.cc",
Expand Down
1 change: 0 additions & 1 deletion base/third_party/xdg_mime/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
# found in the LICENSE file.

static_library("xdg_mime") {
external = true
sources = [
"xdgmime.c",
"xdgmime.h",
Expand Down
1 change: 0 additions & 1 deletion base/third_party/xdg_user_dirs/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
# found in the LICENSE file.

static_library("xdg_user_dirs") {
external = true
sources = [
"xdg_user_dir_lookup.cc",
"xdg_user_dir_lookup.h",
Expand Down
27 changes: 2 additions & 25 deletions tools/gn/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

gyp_file = "gn.gyp"
external = true

# Not defined when doing a GYP build, this lets the code key off of GN-specific
# features (the last change target). This can be removed when the last change
# target is supported by the GN->GYP converter (see is_gyp conditional for that
# below).
if (!is_gyp) {
defines = [ "GN_BUILD" ]
}
defines = [ "GN_BUILD" ]

static_library("gn_lib") {
sources = [
Expand All @@ -32,7 +23,6 @@ static_library("gn_lib") {
"command_args.cc",
"command_desc.cc",
"command_gen.cc",
"command_gyp.cc",
"command_help.cc",
"command_refs.cc",
"commands.cc",
Expand Down Expand Up @@ -69,14 +59,6 @@ static_library("gn_lib") {
"function_write_file.cc",
"group_target_generator.cc",
"group_target_generator.h",
"gyp_binary_target_writer.cc",
"gyp_binary_target_writer.h",
"gyp_helper.cc",
"gyp_helper.h",
"gyp_action_target_writer.cc",
"gyp_action_target_writer.h",
"gyp_target_writer.cc",
"gyp_target_writer.h",
"import_manager.cc",
"import_manager.h",
"input_conversion.cc",
Expand Down Expand Up @@ -174,11 +156,8 @@ executable("gn") {

deps = [
":gn_lib",
"//build/util:last_change",
]
if (!is_gyp) {
# Currently this only works in GYP (see GN_BUILD above).
deps += [ "//build/util:last_change" ]
}
}

test("gn_unittests") {
Expand All @@ -188,8 +167,6 @@ test("gn_unittests") {
"filesystem_utils_unittest.cc",
"file_template_unittest.cc",
"function_rebase_path_unittest.cc",
"gyp_action_target_writer_unittest.cc",
"gyp_binary_target_writer_unittest.cc",
"input_conversion_unittest.cc",
"label_unittest.cc",
"loader_unittest.cc",
Expand Down
4 changes: 0 additions & 4 deletions tools/gn/action_target_generator.cc
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,6 @@ ActionTargetGenerator::~ActionTargetGenerator() {
void ActionTargetGenerator::DoRun() {
target_->set_output_type(output_type_);

FillExternal();
if (err_->has_error())
return;

FillSources();
if (err_->has_error())
return;
Expand Down
4 changes: 0 additions & 4 deletions tools/gn/binary_target_generator.cc
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,6 @@ void BinaryTargetGenerator::DoRun() {
if (err_->has_error())
return;

FillExternal();
if (err_->has_error())
return;

FillSources();
if (err_->has_error())
return;
Expand Down
Loading

0 comments on commit 1539320

Please sign in to comment.