Skip to content

GitLab

T
tangled
Commit 9aed5d58 authored by dpranke's avatar dpranke Committed by Commit bot
Browse files
Options

Re-land "Flip 'Linux x64' bot on chromium waterfall to GN." 

This re-lands #360510 w/ a build fix to  //mojo/shell:apptests
after #360604; It looks like this was broken when we changed
//mojo/shell/application_manager.mojo in #360604 but
for whatever reason //mojo didn't include //mojo/shell:apptests.

With this fix, 'ninja all' should work again in a GN Linux x64 build.

TBR=phajdan.jr@chromium.org, ben@chromium.org, msw@chromium.org
BUG=432959
CQ_EXTRA_TRYBOTS=tryserver.chromium.linux:linux_chromium_archive_rel_ng

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

Cr-Commit-Position: refs/heads/master@{#361056}
parent 928e603a
Hide whitespace changes
Inline Side-by-side
Showing with 181 additions and 178 deletions
BUILD.gn
View file @ 9aed5d58
......@@ -829,7 +829,12 @@ group("chromium_builder_perf") {
deps += [ "//chrome/test:performance_browser_tests" ]
}
if (is_linux && !is_chromeos) {
deps += [ "//chrome:linux_symbols" ]
if (is_official_build) {
# In GN builds, this is controlled by the 'linux_dump_symbols'
# flag, which defaults to 1 for official builds. For now,
# we skip the separate flag and just key off of is_official_build.
deps += [ "//chrome:linux_symbols" ]
}
if (!is_chromeos) {
deps += [ "//tools/perf/clear_system_cache" ]
......
chrome/BUILD.gn
View file @ 9aed5d58
......@@ -1026,40 +1026,42 @@ if (is_linux) {
]
}
action("linux_symbols") {
script = "//build/linux/dump_app_syms.py"
if (is_official_build) {
action("linux_symbols") {
script = "//build/linux/dump_app_syms.py"
dump_syms_label = "//breakpad:dump_syms($host_toolchain)"
dump_syms_binary =
get_label_info(dump_syms_label, "root_out_dir") + "/" + "dump_syms"
dump_syms_label = "//breakpad:dump_syms($host_toolchain)"
dump_syms_binary =
get_label_info(dump_syms_label, "root_out_dir") + "/" + "dump_syms"
chrome_binary = "$root_out_dir/chrome"
if (current_cpu == "x86") {
# Use "ia32" instead of "x86" for GYP compat.
symbol_file = "$root_out_dir/chrome.breakpad.ia32"
} else {
symbol_file = "$root_out_dir/chrome.breakpad.$current_cpu"
}
chrome_binary = "$root_out_dir/chrome"
if (current_cpu == "x86") {
# Use "ia32" instead of "x86" for GYP compat.
symbol_file = "$root_out_dir/chrome.breakpad.ia32"
} else {
symbol_file = "$root_out_dir/chrome.breakpad.$current_cpu"
}
inputs = [
chrome_binary,
dump_syms_binary,
]
outputs = [
symbol_file,
]
inputs = [
chrome_binary,
dump_syms_binary,
]
outputs = [
symbol_file,
]
args = [
"./" + rebase_path(dump_syms_binary, root_build_dir),
"0", # TODO(GYP) This is linux_strip_binary if it is needed.
rebase_path(chrome_binary, root_build_dir),
rebase_path(symbol_file, root_build_dir),
]
args = [
"./" + rebase_path(dump_syms_binary, root_build_dir),
"0", # TODO(GYP) This is linux_strip_binary if it is needed.
rebase_path(chrome_binary, root_build_dir),
rebase_path(symbol_file, root_build_dir),
]
deps = [
":chrome",
dump_syms_label,
]
deps = [
":chrome",
dump_syms_label,
]
}
}
# Copies some scripts and resources that are used for desktop integration.
......
mojo/BUILD.gn
View file @ 9aed5d58
......@@ -97,6 +97,7 @@ group("tests") {
deps += [
"//mojo/package_manager:unittests",
"//mojo/services/network:apptests",
"//mojo/shell:apptests",
"//mojo/shell:mojo_shell_unittests",
]
......
mojo/shell/application_manager_apptest_driver.cc
View file @ 9aed5d58
......@@ -81,8 +81,7 @@ class TargetApplicationDelegate : public mojo::ApplicationDelegate,
application_manager->CreateInstanceForHandle(
mojo::ScopedHandle(mojo::Handle(handle.release().value())),
"exe:application_manager_apptest_target",
"0");
"exe:application_manager_apptest_target");
// Put the other end on the command line used to launch the target.
platform_channel_pair.PrepareToPassClientHandleToChildProcess(
&child_command_line, &handle_passing_info);
......
mojo/shell/application_manager_apptest_target.cc
View file @ 9aed5d58
......@@ -25,9 +25,9 @@ class TargetApplicationDelegate : public mojo::ApplicationDelegate {
// mojo::ApplicationDelegate:
void Initialize(mojo::ApplicationImpl* app) override {
CreateInstanceForHandleTestPtr service;
app->ConnectToService(
mojo::URLRequest::From(std::string("mojo:mojo_shell_apptests")),
&service);
mojo::ApplicationImpl::ConnectParams params(
std::string("mojo:mojo_shell_apptests"));
app->ConnectToService(&params, &service);
service->Ping("From Target");
}
bool ConfigureIncomingConnection(
......
remoting/host/BUILD.gn
View file @ 9aed5d58
......@@ -579,8 +579,7 @@ if (is_mac) { # TODO(GYP) Mac build of remoting host.
deb_filename,
changes_filename,
# TODO(GYP): These files will only be present if we're stripping
# binaries. We need to support linux_dump_symbols for this.
# TODO(GYP): Check that these are generated by build_deb.py.
#"$root_build_dir/remoting_me2me_host.debug",
#"$root_build_dir/remoting_start_host.debug",
#"$root_build_dir/native_messaging_host.debug",
......
testing/buildbot/chromium.json
View file @ 9aed5d58
......@@ -23,7 +23,7 @@
},
"Linux x64": {
"additional_compile_targets": [
"all"
"gn_all"
],
"scripts": [
{
......
tools/mb/mb_config.pyl
View file @ 9aed5d58
......@@ -59,10 +59,10 @@
# This is just for completeness; any bot that uses this config should never actually run MB.
'none': ['none'],
'noswarming_gn_release_bot': ['noswarming', 'gn', 'release_bot'],
'noswarming_gyp_release_bot': ['noswarming', 'gyp', 'release_bot'],
'noswarming_gyp_release_bot_linux_dump_symbols': ['noswarming', 'gyp', 'release_bot', 'linux_dump_symbols'],
'noswarming_gyp_release_bot_mac_strip': ['noswarming', 'gyp', 'release_bot', 'mac_strip'],
'noswarming_gyp_release_bot_x86_linux_dump_symbols': ['noswarming', 'gyp', 'release_bot', 'x86', 'linux_dump_symbols'],
'noswarming_gyp_release_bot_x86': ['noswarming', 'gyp', 'release_bot', 'x86'],
'swarming_asan_lsan_gyp_release_trybot': ['swarming', 'asan', 'lsan', 'release_trybot'],
'swarming_msan_gyp_release_trybot': ['swarming', 'chromeos', 'msan', 'gyp', 'release_trybot'],
......@@ -237,11 +237,6 @@
'libfuzzer': { 'gn_args': 'use_libfuzzer=true' },
'linux_dump_symbols': {
'gn_args': '', # TODO(GYP): Port linux_dump_symbols?
'gyp_defines': 'linux_dump_symbols=1',
},
'lsan': {
'gn_args': 'use_lsan=true',
'gyp_defines': 'lsan=1',
......@@ -277,6 +272,7 @@
},
'noswarming': {
# test_isolation_mode doesn't exist in a GN build (it's always a no-op).
'gn_args': '',
'gyp_defines': 'test_isolation_mode=noop',
},
......@@ -360,8 +356,8 @@
'chromium': {
'Win': 'noswarming_gyp_release_bot',
'Mac': 'noswarming_gyp_release_bot_mac_strip',
'Linux x64': 'noswarming_gyp_release_bot_linux_dump_symbols',
'Linux': 'noswarming_gyp_release_bot_x86_linux_dump_symbols',
'Linux x64': 'noswarming_gn_release_bot',
'Linux': 'noswarming_gyp_release_bot_x86',
'Android': 'android_gyp_release_bot_minimal_symbols',
},
'chromium.android': {
......@@ -503,7 +499,7 @@
'linux_arm_compile': 'swarming_gyp_release_trybot_arm',
'linux_chromium_compile_dbg_32_ng': 'swarming_gyp_debug_trybot_x86',
'linux_chromium_dbg_32_ng': 'swarming_gyp_debug_trybot_x86',
'linux_chromium_archive_rel_ng': 'noswarming_gyp_release_bot_linux_dump_symbols',
'linux_chromium_archive_rel_ng': 'noswarming_gn_release_bot',
'linux_chromium_clobber_rel_ng': 'gyp_release_trybot',
'linux_chromium_gn_upload': 'gn_linux_upload',
'cast_shell_linux': 'cast_gyp_release_trybot',
......
tools/perf_expectations/perf_expectations.json
View file @ 9aed5d58
{
"linux-release-64/sizes/chrome-si/initializers": {"reva": 281711, "revb": 281711, "type": "absolute", "better": "lower", "improve": 7, "regress": 7, "tolerance": 0, "sha1": "b11fc43a"},
{"linux-release-64/sizes/chrome-si/initializers": {"reva": 361030, "revb": 361030, "type": "absolute", "better": "lower", "improve": 18, "regress": 18, "tolerance": 0, "sha1": "258cd4ac"},
"linux-release-64/sizes/nacl_helper-si/initializers": {"reva": 271321, "revb": 271321, "type": "absolute", "better": "lower", "improve": 5, "regress": 7, "sha1": "f29296a1"},
"linux-release-64/sizes/nacl_helper_bootstrap-si/initializers": {"reva": 114822, "revb": 115019, "type": "absolute", "better": "lower", "improve": 0, "regress": 0, "sha1": "228221af"},
"linux-release/sizes/chrome-si/initializers": {"reva": 281717, "revb": 281717, "type": "absolute", "better": "lower", "improve": 8, "regress": 8, "tolerance": 0, "sha1": "b639bbc4"},
......
ui/events/ozone/BUILD.gn
View file @ 9aed5d58
......@@ -17,151 +17,153 @@ if (use_xkbcommon) {
}
}
component("events_ozone") {
sources = [
"chromeos/cursor_controller.cc",
"chromeos/cursor_controller.h",
"device/device_event.cc",
"device/device_event.h",
"device/device_event_observer.h",
"device/device_manager.cc",
"device/device_manager.h",
"device/device_manager_manual.cc",
"device/device_manager_manual.h",
"device/udev/device_manager_udev.cc",
"device/udev/device_manager_udev.h",
"events_ozone_export.h",
]
deps = [
"//base",
"//base/third_party/dynamic_annotations",
"//ui/events",
"//ui/events:events_base",
]
defines = [ "EVENTS_OZONE_IMPLEMENTATION" ]
if (!use_udev) {
sources -= [
if (use_ozone) {
component("events_ozone") {
sources = [
"chromeos/cursor_controller.cc",
"chromeos/cursor_controller.h",
"device/device_event.cc",
"device/device_event.h",
"device/device_event_observer.h",
"device/device_manager.cc",
"device/device_manager.h",
"device/device_manager_manual.cc",
"device/device_manager_manual.h",
"device/udev/device_manager_udev.cc",
"device/udev/device_manager_udev.h",
"events_ozone_export.h",
]
}
if (use_ozone && use_udev) {
deps += [ "//device/udev_linux" ]
}
}
deps = [
"//base",
"//base/third_party/dynamic_annotations",
"//ui/events",
"//ui/events:events_base",
]
config("evdev") {
defines = [ "USE_EVDEV" ]
}
defines = [ "EVENTS_OZONE_IMPLEMENTATION" ]
config("evdev_gestures") {
defines = [ "USE_EVDEV_GESTURES" ]
}
if (!use_udev) {
sources -= [
"device/udev/device_manager_udev.cc",
"device/udev/device_manager_udev.h",
]
}
if (use_evdev_gestures) {
pkg_config("libevdev-cros") {
packages = [ "libevdev-cros" ]
if (use_ozone && use_udev) {
deps += [ "//device/udev_linux" ]
}
}
pkg_config("libgestures") {
packages = [ "libgestures" ]
config("evdev") {
defines = [ "USE_EVDEV" ]
}
}
component("events_ozone_evdev") {
sources = [
"evdev/device_event_dispatcher_evdev.cc",
"evdev/device_event_dispatcher_evdev.h",
"evdev/event_converter_evdev.cc",
"evdev/event_converter_evdev.h",
"evdev/event_converter_evdev_impl.cc",
"evdev/event_converter_evdev_impl.h",
"evdev/event_device_info.cc",
"evdev/event_device_info.h",
"evdev/event_factory_evdev.cc",
"evdev/event_factory_evdev.h",
"evdev/event_modifiers_evdev.cc",
"evdev/event_modifiers_evdev.h",
"evdev/event_thread_evdev.cc",
"evdev/event_thread_evdev.h",
"evdev/events_ozone_evdev_export.h",
"evdev/input_controller_evdev.cc",
"evdev/input_controller_evdev.h",
"evdev/input_device_factory_evdev.cc",
"evdev/input_device_factory_evdev.h",
"evdev/input_device_factory_evdev_proxy.cc",
"evdev/input_device_factory_evdev_proxy.h",
"evdev/input_device_settings_evdev.cc",
"evdev/input_device_settings_evdev.h",
"evdev/input_injector_evdev.cc",
"evdev/input_injector_evdev.h",
"evdev/keyboard_evdev.cc",
"evdev/keyboard_evdev.h",
"evdev/keyboard_util_evdev.cc",
"evdev/keyboard_util_evdev.h",
"evdev/mouse_button_map_evdev.cc",
"evdev/mouse_button_map_evdev.h",
"evdev/tablet_event_converter_evdev.cc",
"evdev/tablet_event_converter_evdev.h",
"evdev/touch_evdev_debug_buffer.cc",
"evdev/touch_evdev_debug_buffer.h",
"evdev/touch_evdev_types.cc",
"evdev/touch_evdev_types.h",
"evdev/touch_event_converter_evdev.cc",
"evdev/touch_event_converter_evdev.h",
"evdev/touch_noise/far_apart_taps_touch_noise_filter.cc",
"evdev/touch_noise/far_apart_taps_touch_noise_filter.h",
"evdev/touch_noise/horizontally_aligned_touch_noise_filter.cc",
"evdev/touch_noise/horizontally_aligned_touch_noise_filter.h",
"evdev/touch_noise/single_position_touch_noise_filter.cc",
"evdev/touch_noise/single_position_touch_noise_filter.h",
"evdev/touch_noise/touch_noise_filter.h",
"evdev/touch_noise/touch_noise_finder.cc",
"evdev/touch_noise/touch_noise_finder.h",
]
defines = [ "EVENTS_OZONE_EVDEV_IMPLEMENTATION" ]
config("evdev_gestures") {
defines = [ "USE_EVDEV_GESTURES" ]
}
deps = [
":events_ozone",
":events_ozone_layout",
"//base",
"//ui/events",
"//ui/events:dom_keycode_converter",
"//ui/events:events_base",
"//ui/events/devices",
"//ui/events/platform",
"//ui/gfx",
]
if (use_evdev_gestures) {
pkg_config("libevdev-cros") {
packages = [ "libevdev-cros" ]
}
public_configs = [ ":evdev" ]
pkg_config("libgestures") {
packages = [ "libgestures" ]
}
}
if (use_ozone && use_evdev_gestures) {
sources += [
"evdev/libgestures_glue/event_reader_libevdev_cros.cc",
"evdev/libgestures_glue/event_reader_libevdev_cros.h",
"evdev/libgestures_glue/gesture_feedback.cc",
"evdev/libgestures_glue/gesture_feedback.h",
"evdev/libgestures_glue/gesture_interpreter_libevdev_cros.cc",
"evdev/libgestures_glue/gesture_interpreter_libevdev_cros.h",
"evdev/libgestures_glue/gesture_logging.cc",
"evdev/libgestures_glue/gesture_logging.h",
"evdev/libgestures_glue/gesture_property_provider.cc",
"evdev/libgestures_glue/gesture_property_provider.h",
"evdev/libgestures_glue/gesture_timer_provider.cc",
"evdev/libgestures_glue/gesture_timer_provider.h",
component("events_ozone_evdev") {
sources = [
"evdev/device_event_dispatcher_evdev.cc",
"evdev/device_event_dispatcher_evdev.h",
"evdev/event_converter_evdev.cc",
"evdev/event_converter_evdev.h",
"evdev/event_converter_evdev_impl.cc",
"evdev/event_converter_evdev_impl.h",
"evdev/event_device_info.cc",
"evdev/event_device_info.h",
"evdev/event_factory_evdev.cc",
"evdev/event_factory_evdev.h",
"evdev/event_modifiers_evdev.cc",
"evdev/event_modifiers_evdev.h",
"evdev/event_thread_evdev.cc",
"evdev/event_thread_evdev.h",
"evdev/events_ozone_evdev_export.h",
"evdev/input_controller_evdev.cc",
"evdev/input_controller_evdev.h",
"evdev/input_device_factory_evdev.cc",
"evdev/input_device_factory_evdev.h",
"evdev/input_device_factory_evdev_proxy.cc",
"evdev/input_device_factory_evdev_proxy.h",
"evdev/input_device_settings_evdev.cc",
"evdev/input_device_settings_evdev.h",
"evdev/input_injector_evdev.cc",
"evdev/input_injector_evdev.h",
"evdev/keyboard_evdev.cc",
"evdev/keyboard_evdev.h",
"evdev/keyboard_util_evdev.cc",
"evdev/keyboard_util_evdev.h",
"evdev/mouse_button_map_evdev.cc",
"evdev/mouse_button_map_evdev.h",
"evdev/tablet_event_converter_evdev.cc",
"evdev/tablet_event_converter_evdev.h",
"evdev/touch_evdev_debug_buffer.cc",
"evdev/touch_evdev_debug_buffer.h",
"evdev/touch_evdev_types.cc",
"evdev/touch_evdev_types.h",
"evdev/touch_event_converter_evdev.cc",
"evdev/touch_event_converter_evdev.h",
"evdev/touch_noise/far_apart_taps_touch_noise_filter.cc",
"evdev/touch_noise/far_apart_taps_touch_noise_filter.h",
"evdev/touch_noise/horizontally_aligned_touch_noise_filter.cc",
"evdev/touch_noise/horizontally_aligned_touch_noise_filter.h",
"evdev/touch_noise/single_position_touch_noise_filter.cc",
"evdev/touch_noise/single_position_touch_noise_filter.h",
"evdev/touch_noise/touch_noise_filter.h",
"evdev/touch_noise/touch_noise_finder.cc",
"evdev/touch_noise/touch_noise_finder.h",
]
public_configs += [ ":evdev_gestures" ]
configs += [
":libevdev-cros",
":libgestures",
defines = [ "EVENTS_OZONE_EVDEV_IMPLEMENTATION" ]
deps = [
":events_ozone",
":events_ozone_layout",
"//base",
"//ui/events",
"//ui/events:dom_keycode_converter",
"//ui/events:events_base",
"//ui/events/devices",
"//ui/events/platform",
"//ui/gfx",
]
public_configs = [ ":evdev" ]
if (use_ozone && use_evdev_gestures) {
sources += [
"evdev/libgestures_glue/event_reader_libevdev_cros.cc",
"evdev/libgestures_glue/event_reader_libevdev_cros.h",
"evdev/libgestures_glue/gesture_feedback.cc",
"evdev/libgestures_glue/gesture_feedback.h",
"evdev/libgestures_glue/gesture_interpreter_libevdev_cros.cc",
"evdev/libgestures_glue/gesture_interpreter_libevdev_cros.h",
"evdev/libgestures_glue/gesture_logging.cc",
"evdev/libgestures_glue/gesture_logging.h",
"evdev/libgestures_glue/gesture_property_provider.cc",
"evdev/libgestures_glue/gesture_property_provider.h",
"evdev/libgestures_glue/gesture_timer_provider.cc",
"evdev/libgestures_glue/gesture_timer_provider.h",
]
public_configs += [ ":evdev_gestures" ]
configs += [
":libevdev-cros",
":libgestures",
]
}
}
}
......
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