Commit 3bb16a4e authored by Ryo Hashimoto's avatar Ryo Hashimoto Committed by Commit Bot

chromeos: Stop linking fake D-Bus clients to shipped chrome

Set use_real_dbus_clients to true when building for real devices.

chromeos-amd64-generic-rel and chromeos-betty-pi-arc-chrome build chrome
for real devices, but run interactive_ui_tests which relies on fake
D-Bus clients.
Change mb_config.pyl to set use_real_dbus_clients to false for them.

BUG=952745
TEST=chrome binary size reduced by 460KB on eve.

Change-Id: Ibbb08babe5b693447158fc9192d1df854992e29f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2282635Reviewed-by: default avatarBen Pastene <bpastene@chromium.org>
Reviewed-by: default avatarMitsuru Oshima <oshima@chromium.org>
Reviewed-by: default avatarSteven Bennetts <stevenjb@chromium.org>
Commit-Queue: Ryo Hashimoto <hashimoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#786629}
parent bb48402a
...@@ -9,7 +9,7 @@ assert(is_chromeos, "Non-Chrome-OS builds must not depend on //chromeos") ...@@ -9,7 +9,7 @@ assert(is_chromeos, "Non-Chrome-OS builds must not depend on //chromeos")
declare_args() { declare_args() {
# Instantiate real D-Bus clients instead of fakes. # Instantiate real D-Bus clients instead of fakes.
use_real_dbus_clients = false use_real_dbus_clients = is_chromeos_device
} }
component("dbus") { component("dbus") {
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
'chrome': { 'chrome': {
'chromeos-arm-generic-cfi-thin-lto-chrome': 'chromeos_arm-generic_cfi_thin_lto_official', 'chromeos-arm-generic-cfi-thin-lto-chrome': 'chromeos_arm-generic_cfi_thin_lto_official',
'chromeos-betty-pi-arc-cfi-thin-lto-chrome': 'chromeos_betty-pi-arc_cfi_thin_lto_official', 'chromeos-betty-pi-arc-cfi-thin-lto-chrome': 'chromeos_betty-pi-arc_cfi_thin_lto_official',
'chromeos-betty-pi-arc-chrome': 'chromeos_betty-pi-arc_include_unwind_tables_official', 'chromeos-betty-pi-arc-chrome': 'chromeos_betty-pi-arc_include_unwind_tables_official_use_fake_dbus_clients',
'chromeos-eve-chrome': 'chromeos_eve_include_unwind_tables_official', 'chromeos-eve-chrome': 'chromeos_eve_include_unwind_tables_official',
'chromeos-eve-arc-r-chrome': 'chromeos_eve-arc-r_include_unwind_tables_official', 'chromeos-eve-arc-r-chrome': 'chromeos_eve-arc-r_include_unwind_tables_official',
'chromeos-kevin-chrome': 'chromeos_kevin_include_unwind_tables_official', 'chromeos-kevin-chrome': 'chromeos_kevin_include_unwind_tables_official',
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
'chromeos-amd64-generic-asan-rel': 'chromeos_amd64-generic_asan', 'chromeos-amd64-generic-asan-rel': 'chromeos_amd64-generic_asan',
'chromeos-amd64-generic-cfi-thin-lto-rel': 'chromeos_amd64-generic_cfi_thin_lto', 'chromeos-amd64-generic-cfi-thin-lto-rel': 'chromeos_amd64-generic_cfi_thin_lto',
'chromeos-amd64-generic-dbg': 'chromeos_amd64-generic_dbg', 'chromeos-amd64-generic-dbg': 'chromeos_amd64-generic_dbg',
'chromeos-amd64-generic-rel': 'chromeos_amd64-generic', 'chromeos-amd64-generic-rel': 'chromeos_amd64-generic_use_fake_dbus_clients',
'chromeos-arm-generic-dbg': 'chromeos_arm-generic_dbg', 'chromeos-arm-generic-dbg': 'chromeos_arm-generic_dbg',
'chromeos-arm-generic-rel': 'chromeos_arm-generic', 'chromeos-arm-generic-rel': 'chromeos_arm-generic',
'chromeos-kevin-rel': 'chromeos_kevin', 'chromeos-kevin-rel': 'chromeos_kevin',
...@@ -784,7 +784,7 @@ ...@@ -784,7 +784,7 @@
'tryserver.chrome': { 'tryserver.chrome': {
'chromeos-arm-generic-cfi-thin-lto-chrome': 'chromeos_arm-generic_cfi_thin_lto_official', 'chromeos-arm-generic-cfi-thin-lto-chrome': 'chromeos_arm-generic_cfi_thin_lto_official',
'chromeos-betty-pi-arc-cfi-thin-lto-chrome': 'chromeos_betty-pi-arc_cfi_thin_lto_official', 'chromeos-betty-pi-arc-cfi-thin-lto-chrome': 'chromeos_betty-pi-arc_cfi_thin_lto_official',
'chromeos-betty-pi-arc-chrome': 'chromeos_betty-pi-arc_include_unwind_tables_official', 'chromeos-betty-pi-arc-chrome': 'chromeos_betty-pi-arc_include_unwind_tables_official_use_fake_dbus_clients',
'chromeos-eve-arc-r-chrome': 'chromeos_eve-arc-r_include_unwind_tables_official', 'chromeos-eve-arc-r-chrome': 'chromeos_eve-arc-r_include_unwind_tables_official',
'chromeos-eve-chrome': 'chromeos_eve_include_unwind_tables_official', 'chromeos-eve-chrome': 'chromeos_eve_include_unwind_tables_official',
'chromeos-eve-compile-chrome': 'chromeos_eve_include_unwind_tables_official', 'chromeos-eve-compile-chrome': 'chromeos_eve_include_unwind_tables_official',
...@@ -809,7 +809,7 @@ ...@@ -809,7 +809,7 @@
# and two kevin bots when the PFQ has it enabled. # and two kevin bots when the PFQ has it enabled.
'chromeos-amd64-generic-cfi-thin-lto-rel': 'chromeos_amd64-generic_cfi_thin_lto', 'chromeos-amd64-generic-cfi-thin-lto-rel': 'chromeos_amd64-generic_cfi_thin_lto',
'chromeos-amd64-generic-dbg': 'chromeos_amd64-generic_dbg', 'chromeos-amd64-generic-dbg': 'chromeos_amd64-generic_dbg',
'chromeos-amd64-generic-rel': 'chromeos_amd64-generic', 'chromeos-amd64-generic-rel': 'chromeos_amd64-generic_use_fake_dbus_clients',
'chromeos-arm-generic-dbg': 'chromeos_arm-generic_dbg', 'chromeos-arm-generic-dbg': 'chromeos_arm-generic_dbg',
'chromeos-arm-generic-rel': 'chromeos_arm-generic_dcheck_always_on', 'chromeos-arm-generic-rel': 'chromeos_arm-generic_dcheck_always_on',
'chromeos-kevin-compile-rel': 'chromeos_kevin', 'chromeos-kevin-compile-rel': 'chromeos_kevin',
...@@ -1488,6 +1488,10 @@ ...@@ -1488,6 +1488,10 @@
'chromeos_amd64-generic', 'debug', 'chromeos_amd64-generic', 'debug',
], ],
'chromeos_amd64-generic_use_fake_dbus_clients': [
'chromeos_amd64-generic', 'use_fake_dbus_clients',
],
'chromeos_arm-generic': [ 'chromeos_arm-generic': [
'chromeos_device', 'arm-generic', 'chromeos_device', 'arm-generic',
], ],
...@@ -1515,8 +1519,8 @@ ...@@ -1515,8 +1519,8 @@
'chromeos_lto_link_jobs', 'chromeos_lto_link_jobs',
], ],
'chromeos_betty-pi-arc_include_unwind_tables_official': [ 'chromeos_betty-pi-arc_include_unwind_tables_official_use_fake_dbus_clients': [
'chromeos_device', 'betty-pi-arc', 'include_unwind_tables', 'official', 'chromeos_device', 'betty-pi-arc', 'include_unwind_tables', 'official', 'use_fake_dbus_clients',
], ],
'chromeos_eve-arc-r_include_unwind_tables_official': [ 'chromeos_eve-arc-r_include_unwind_tables_official': [
...@@ -2962,6 +2966,10 @@ ...@@ -2962,6 +2966,10 @@
'gn_args': 'use_dummy_lastchange=true', 'gn_args': 'use_dummy_lastchange=true',
}, },
'use_fake_dbus_clients': {
'gn_args': 'use_real_dbus_clients=false',
},
'use_java_coverage': { 'use_java_coverage': {
'gn_args': 'use_jacoco_coverage=true', 'gn_args': 'use_jacoco_coverage=true',
}, },
......
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