Skip to content

GitLab

T
tangled
Commit e6d374cf authored by hiroshige's avatar hiroshige Committed by Commit bot
Browse files
Options

Revert of add gn_all, gyp_all targets to build files, remove GN's //:root... 

Revert of add gn_all, gyp_all targets to build files, remove GN's //:root (patchset #18 id:350001 of https://codereview.chromium.org/936193004/)

Reason for revert:
Suspecting this breaks Mac builds.
http://build.chromium.org/p/chromium/builders/Mac/builds/33993

Original issue's description:
> add gn_all, gyp_all targets to the build files, remove GN's //:root
>
> In order to be able to make sure we are building the same list of targets
> in both the GYP and GN builds, this patch adds new 'gn_all' and 'gyp_all'
> targets.
>
> Eventually, we should make sure that if one builds 'gn_all', then building
> 'gyp_all', 'All', or 'all' then has nothing to do. We're not there yet, but this
> is a start.
>
> The 'gn_all' target replaces the //:root target in the GN builds.
>
> R=brettw@chromium.org
> BUG=461019
> CQ_EXTRA_TRYBOTS=tryserver.chromium.linux:android_chromium_gn_compile_dbg,android_chromium_gn_compile_rel;tryserver.chromium.win:win8_chromium_gn_rel,win8_chromium_gn_dbg;tryserver.chromium.mac:mac_chromium_gn_rel,mac_chromium_gn_dbg
>
> Committed: https://crrev.com/ff30e3de333305ccdaa103aa7f9e46765da83e99
> Cr-Commit-Position: refs/heads/master@{#317760}

TBR=brettw@chromium.org,dpranke@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=461019

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

Cr-Commit-Position: refs/heads/master@{#317763}
parent 57b85942
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 237 additions and 391 deletions
BUILD.gn
View file @ e6d374cf
This diff is collapsed.
build/all.gyp
View file @ e6d374cf
...@@ -467,157 +467,8 @@ ...@@ -467,157 +467,8 @@
}, # target_name: chromium_builder_tests }, # target_name: chromium_builder_tests
], ],
'conditions': [ 'conditions': [
# TODO(GYP) - make gyp_all and gn_all work on iOS and Android also. ['OS!="ios"', {
['OS!="ios" and OS!="android"', {
'targets': [ 'targets': [
{
'target_name': 'gyp_all',
'type': 'none',
'dependencies': [
':gn_all',
'../chrome/chrome.gyp:chromedriver_unittests',
'../components/components_tests.gyp:components_browsertests',
# '../components/nacl.gyp:nacl_loader_unittests', # TODO(GYP)
# '../remoting/remoting.gyp:remoting_unittests', # TODO(GYP)
'../ui/compositor/compositor.gyp:compositor_unittests',
],
'conditions': [
['OS!="android"', {
'dependencies': [
# '../device/device_tests.gyp:device_unittests', # TODO(GYP)
# '../google_apis/google_apis.gyp:google_apis_unittests', # TODO(GYP)
],
}],
],
},
{
'target_name': 'gn_all',
'type': 'none',
'dependencies': [
'../base/base.gyp:base_unittests',
'../cc/cc_tests.gyp:cc_unittests',
'../chrome/chrome.gyp:chrome',
'../chrome/chrome.gyp:browser_tests',
'../chrome/chrome.gyp:interactive_ui_tests',
'../chrome/chrome.gyp:sync_integration_tests',
'../chrome/chrome.gyp:unit_tests',
'../components/components_tests.gyp:components_unittests',
'../content/content_shell_and_tests.gyp:content_shell',
'../content/content_shell_and_tests.gyp:content_browsertests',
'../content/content_shell_and_tests.gyp:content_perftests',
'../content/content_shell_and_tests.gyp:content_unittests',
'../crypto/crypto.gyp:crypto_unittests',
'../extensions/extensions_tests.gyp:extensions_browsertests',
'../extensions/extensions_tests.gyp:extensions_unittests',
'../google_apis/gcm/gcm.gyp:gcm_unit_tests',
'../gpu/gpu.gyp:gpu_unittests',
'../ipc/ipc.gyp:ipc_tests',
'../ipc/mojo/ipc_mojo.gyp:ipc_mojo_unittests',
'../jingle/jingle.gyp:jingle_unittests',
'../media/media.gyp:media_unittests',
'../media/cast/cast.gyp:cast_unittests',
'../mojo/mojo.gyp:mojo',
'../mojo/mojo_base.gyp:mojo_common_unittests',
'../net/net.gyp:net_unittests',
'../ppapi/ppapi_internal.gyp:ppapi_tests',
'../printing/printing.gyp:printing_unittests',
'../sql/sql.gyp:sql_unittests',
'../skia/skia_tests.gyp:skia_unittests',
'../sync/sync.gyp:sync_unit_tests',
# TODO(GYP): the Blink test targets should be public, but
# currently aren't. all_blink puls them in, though
# "//third_party/WebKit/Source/platform:heap_unittests",
# "//third_party/WebKit/Source/platform:platform_unittests",
# "//third_party/WebKit/Source/wtf:wtf_unittests",
'../third_party/WebKit/public/all.gyp:all_blink',
'../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation_unittests',
# TODO(GYP): Needed only w/ cld_version==1. What configs set that?
'../third_party/cld/cld.gyp:cld',
# TODO(GYP): This is needed only w/ use_system_fontconfig==0. What configs set that?
#'../third_party/fontconfig/fontconfig.gyp:fontconfig',
# TODO(GYP): This will be pulled in automatically when enable_webrtc==true.
# For now pull it in manually so that it doesn't regress.
'../third_party/libsrtp/libsrtp.gyp:libsrtp',
'../third_party/mojo/mojo_edk_tests.gyp:mojo_system_unittests',
'../third_party/mojo/mojo_edk_tests.gyp:mojo_public_bindings_unittests',
'../third_party/mojo/mojo_edk_tests.gyp:mojo_public_environment_unittests',
'../third_party/mojo/mojo_edk_tests.gyp:mojo_public_system_perftests',
'../third_party/mojo/mojo_edk_tests.gyp:mojo_public_system_unittests',
'../third_party/mojo/mojo_edk_tests.gyp:mojo_public_utility_unittests',
'../third_party/pdfium/samples/samples.gyp:pdfium_test',
# TODO(GYP): Verify that this is no longer needed.
'../third_party/smhasher/smhasher.gyp:pmurhash',
# TODO(GYP): This will be pulled in automatically when enable_webrtc==true.
# For now pull it in manually so that it doesn't regress.
'../third_party/usrsctp/usrsctp.gyp:usrsctplib',
'../tools/gn/gn.gyp:gn',
'../tools/gn/gn.gyp:gn_unittests',
'../tools/imagediff/image_diff.gyp:image_diff#host',
'../ui/accessibility/accessibility.gyp:accessibility_unittests',
'../ui/app_list/app_list.gyp:app_list_unittests',
'../ui/base/ui_base_tests.gyp:ui_base_unittests',
'../ui/display/display.gyp:display_unittests',
'../ui/events/events.gyp:events_unittests',
'../ui/gfx/gfx_tests.gyp:gfx_unittests',
'../ui/touch_selection/ui_touch_selection.gyp:ui_touch_selection_unittests',
'../ui/views/views.gyp:views_unittests',
'../ui/wm/wm.gyp:wm_unittests',
'../url/url.gyp:url_unittests',
],
'conditions': [
['OS!="win"', {
'dependencies': [
'../breakpad/breakpad.gyp:symupload#host',
],
}],
['use_x11==1', {
'dependencies': [
'../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
],
}],
['use_aura==1', {
'dependencies': [
'../ui/wm/wm.gyp:wm_unittests',
],
}],
['use_ozone==1', {
'dependencies': [
'../ui/ozone/ozone.gyp:ozone',
'../ui/ozone/demo.gyp:demo',
],
}],
['OS=="win" or OS=="mac" or OS=="android"', {
'dependencies': [
'../rlz/rlz.gyp:rlz_lib',
],
}],
['OS=="android"', {
'dependencies': [
'../chrome/chrome.gyp:chrome_shell_apk',
'../content/content_shell_and_tests.gyp:content_shell_apk',
],
'dependencies!': [
'../url/url.gyp:url_unittests',
],
}],
['OS=="linux"', {
'dependencies': [
'../dbus/dbus.gyp:dbus_unittests',
'../sandbox/sandbox.gyp:sandbox_linux_unittests',
],
}],
],
},
{ {
'target_name': 'blink_tests', 'target_name': 'blink_tests',
'type': 'none', 'type': 'none',
......
build/secondary/tools/grit/grit_rule.gni
View file @ e6d374cf
...@@ -53,8 +53,6 @@ ...@@ -53,8 +53,6 @@
# use_qualified_include (optional) # use_qualified_include (optional)
# If set, output_dir is not added to include_dirs. # If set, output_dir is not added to include_dirs.
# #
# configs (optional)
# List of additional configs to be applied to the generated target.
# deps (optional) # deps (optional)
# inputs (optional) # inputs (optional)
# List of additional files, required for grit to process source file. # List of additional files, required for grit to process source file.
...@@ -440,10 +438,6 @@ template("grit") { ...@@ -440,10 +438,6 @@ template("grit") {
public_configs += invoker.public_configs public_configs += invoker.public_configs
} }
if (defined(invoker.configs)) {
configs += invoker.configs
}
if (defined(invoker.visibility)) { if (defined(invoker.visibility)) {
visibility = invoker.visibility visibility = invoker.visibility
} }
......
chrome/test/BUILD.gn
View file @ e6d374cf
...@@ -380,7 +380,9 @@ if (!is_android && (!is_win || link_chrome_on_windows)) { ...@@ -380,7 +380,9 @@ if (!is_android && (!is_win || link_chrome_on_windows)) {
} }
if (is_mac) { if (is_mac) {
datadeps += [ "//chrome" ] datadeps = [
"//chrome",
]
# TODO(mark): We really want this for all non-static library targets, but # TODO(mark): We really want this for all non-static library targets, but
# when we tried to pull it up to the common.gypi level, it broke other # when we tried to pull it up to the common.gypi level, it broke other
...@@ -877,6 +879,7 @@ if (!is_android && (!is_win || link_chrome_on_windows)) { ...@@ -877,6 +879,7 @@ if (!is_android && (!is_win || link_chrome_on_windows)) {
] ]
sources += [ sources += [
"../browser/media_galleries/fileapi/iphoto_data_provider_browsertest.cc", "../browser/media_galleries/fileapi/iphoto_data_provider_browsertest.cc",
"../browser/renderer_host/chrome_render_widget_host_view_mac_delegate_browsertest.cc",
"../browser/renderer_host/chrome_render_widget_host_view_mac_history_swiper_browsertest.mm", "../browser/renderer_host/chrome_render_widget_host_view_mac_history_swiper_browsertest.mm",
"../browser/spellchecker/spellcheck_message_filter_mac_browsertest.cc", "../browser/spellchecker/spellcheck_message_filter_mac_browsertest.cc",
] ]
...@@ -887,13 +890,11 @@ if (!is_android && (!is_win || link_chrome_on_windows)) { ...@@ -887,13 +890,11 @@ if (!is_android && (!is_win || link_chrome_on_windows)) {
# TODO(rouslan): This test depends on the custom dictionary UI, # TODO(rouslan): This test depends on the custom dictionary UI,
# which is disabled on Mac. # which is disabled on Mac.
# TODO(GYP): This should be added somewhere first ... "../browser/ui/webui/options/edit_dictionary_browsertest.js",
# "../browser/ui/webui/options/edit_dictionary_browsertest.js",
# TODO(rouslan): This test depends on hunspell and we cannot run it # TODO(rouslan): This test depends on hunspell and we cannot run it
# on Mac, which does use hunspell by default. # on Mac, which does use hunspell by default.
# TODO(GYP): This should be added somewhere first ... "../browser/ui/webui/options/language_options_dictionary_download_browsertest.js",
# "../browser/ui/webui/options/language_options_dictionary_download_browsertest.js",
# ProcessSingletonMac doesn"t do anything. # ProcessSingletonMac doesn"t do anything.
"../browser/process_singleton_browsertest.cc", "../browser/process_singleton_browsertest.cc",
...@@ -1550,7 +1551,7 @@ if (!is_android && (!is_win || link_chrome_on_windows)) { ...@@ -1550,7 +1551,7 @@ if (!is_android && (!is_win || link_chrome_on_windows)) {
# on disk so it can pull from it. # on disk so it can pull from it.
deps += [ deps += [
"//third_party/google_toolbox_for_mac", "//third_party/google_toolbox_for_mac",
# "//third_party/ocmock", # TODO(GYP) "//third_party/ocmock",
] ]
# TODO(mark): We really want this for all non-static library targets, # TODO(mark): We really want this for all non-static library targets,
......
components/pdf/renderer/BUILD.gn
View file @ e6d374cf
...@@ -21,7 +21,6 @@ static_library("renderer") { ...@@ -21,7 +21,6 @@ static_library("renderer") {
"//base", "//base",
"//components/pdf/common", "//components/pdf/common",
"//components/resources:components_resources", "//components/resources:components_resources",
"//components/resources:components_scaled_resources",
"//components/strings", "//components/strings",
"//content/public/renderer", "//content/public/renderer",
"//gin", "//gin",
......
third_party/libaddressinput/BUILD.gn
View file @ e6d374cf
...@@ -24,12 +24,6 @@ libaddressinput_util_files = [ ...@@ -24,12 +24,6 @@ libaddressinput_util_files = [
"src/cpp/src/util/string_util.cc", "src/cpp/src/util/string_util.cc",
] ]
config("no-newline-eof-warning") {
if (is_clang) {
cflags = [ "-Wno-newline-eof" ]
}
}
# GYP version: third_party/libaddressinput/libaddressinput.gyp:libaddressinput_strings # GYP version: third_party/libaddressinput/libaddressinput.gyp:libaddressinput_strings
grit("strings") { grit("strings") {
source = "//chrome/app/address_input_strings.grd" source = "//chrome/app/address_input_strings.grd"
...@@ -91,8 +85,6 @@ grit("strings") { ...@@ -91,8 +85,6 @@ grit("strings") {
"address_input_strings_zh-CN.pak", "address_input_strings_zh-CN.pak",
"address_input_strings_zh-TW.pak", "address_input_strings_zh-TW.pak",
] ]
configs = [ ":no-newline-eof-warning" ]
} }
config("libaddressinput_config") { config("libaddressinput_config") {
...@@ -117,10 +109,7 @@ static_library("util") { ...@@ -117,10 +109,7 @@ static_library("util") {
sources -= [ "src/cpp/src/util/json.cc" ] sources -= [ "src/cpp/src/util/json.cc" ]
configs -= [ "//build/config/compiler:chromium_code" ] configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ configs += [ "//build/config/compiler:no_chromium_code" ]
":no-newline-eof-warning",
"//build/config/compiler:no_chromium_code",
]
public_configs = [ ":libaddressinput_config" ] public_configs = [ ":libaddressinput_config" ]
......
third_party/libexif/BUILD.gn
View file @ e6d374cf
...@@ -4,19 +4,10 @@ ...@@ -4,19 +4,10 @@
# Linux should use system libexif # Linux should use system libexif
if (!is_linux || is_chromeos) { if (!is_linux || is_chromeos) {
# TODO(thestig): Properly support building on Linux. # TODO(thestig): Properly support building on Linux.
config("libexif_config") { config("libexif_config") {
include_dirs = [ "sources" ] include_dirs = [ "sources" ]
if (is_clang) {
cflags = [
"-Wno-enum-conversion",
"-Wno-switch",
"-Wno-format",
# libexif uses fabs(int) to cast to float.
"-Wno-absolute-value",
]
}
} }
static_library("libexif") { static_library("libexif") {
...@@ -60,7 +51,9 @@ if (!is_linux || is_chromeos) { ...@@ -60,7 +51,9 @@ if (!is_linux || is_chromeos) {
ldflags = [ "/DEF:" + rebase_path("libexif.def") ] ldflags = [ "/DEF:" + rebase_path("libexif.def") ]
cflags = [ "/wd4018" ] # size/unsigned mismatch cflags = [
"/wd4018", # size/unsigned mismatch
]
# TODO(GYP): Handle /analyze switch, when it will be used in GN. # TODO(GYP): Handle /analyze switch, when it will be used in GN.
} else if (is_linux) { } else if (is_linux) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment