Commit 3d38292a authored by Matthew Cary's avatar Matthew Cary Committed by Commit Bot

Orderfile: remove symbol_level=0 for instrumented builds.

It is no longer necessary to build without symbols to keep the
instrumented library size under 4G (a recent local instrumented build
with symbol_level=0 had an unstripped library size of ~500M). Removing
this custom arg will make future debugging of orderfile issues
easier as there will be fewer variations to account for.

Change-Id: I84078e7f0a2f3033031755e884c3e72049b2beed
Reviewed-on: https://chromium-review.googlesource.com/c/1317571Reviewed-by: default avatarEgor Pasko <pasko@chromium.org>
Reviewed-by: default avatarBenoit L <lizeb@chromium.org>
Reviewed-by: default avatarDirk Pranke <dpranke@chromium.org>
Commit-Queue: Matthew Cary <mattcary@chromium.org>
Cr-Commit-Position: refs/heads/master@{#608302}
parent 84286d65
...@@ -190,12 +190,8 @@ declare_args() { ...@@ -190,12 +190,8 @@ declare_args() {
# If it wasn't manually set, set to an appropriate default. # If it wasn't manually set, set to an appropriate default.
assert(symbol_level >= -1 && symbol_level <= 2, "Invalid symbol_level") assert(symbol_level >= -1 && symbol_level <= 2, "Invalid symbol_level")
if (symbol_level == -1) { if (symbol_level == -1) {
if (is_android && use_order_profiling) { if (is_android && !is_component_build &&
# With instrumentation enabled, debug info puts libchrome.so over 4gb, which !(android_64bit_target_cpu && !build_apk_secondary_abi)) {
# causes the linker to produce an invalid ELF. http://crbug.com/574476
symbol_level = 0
} else if (is_android && !is_component_build &&
!(android_64bit_target_cpu && !build_apk_secondary_abi)) {
# Reduce symbol level when it will cause invalid elf files to be created # Reduce symbol level when it will cause invalid elf files to be created
# (due to file size). https://crbug.com/648948. # (due to file size). https://crbug.com/648948.
symbol_level = 1 symbol_level = 1
......
...@@ -269,10 +269,6 @@ class ClankCompiler(object): ...@@ -269,10 +269,6 @@ class ClankCompiler(object):
'is_chrome_branded=true', 'is_chrome_branded=true',
'is_debug=false', 'is_debug=false',
'is_official_build=true', 'is_official_build=true',
# We have to build with no symbols if profiling and minimal symbols
# otherwise for libchrome.so to fit under the 4 GB limit.
# crbug.com/574476
'symbol_level=' + ('0' if instrumented else '1'),
'target_cpu="' + self._arch + '"', 'target_cpu="' + self._arch + '"',
'target_os="android"', 'target_os="android"',
'use_goma=' + str(self._use_goma).lower(), 'use_goma=' + str(self._use_goma).lower(),
......
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