Index: build/config/compiler/compiler.gni |
diff --git a/build/config/compiler/compiler.gni b/build/config/compiler/compiler.gni |
index e9e809a9061bceffc3b7b67a3e1697f6d45f5d78..20ad5869acdc1976ac09e547dbb46811d9af6988 100644 |
--- a/build/config/compiler/compiler.gni |
+++ b/build/config/compiler/compiler.gni |
@@ -87,7 +87,7 @@ if (symbol_level == -1) { |
# With instrumentation enabled, debug info puts libchrome.so over 4gb, which |
# causes the linker to produce an invalid ELF. http://crbug.com/574476 |
symbol_level = 0 |
- } else if (is_android && !is_component_build && !is_clang && |
+ } 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 |
# (due to file size). https://crbug.com/648948. |
@@ -116,7 +116,7 @@ if (symbol_level == -1) { |
# Assert that the configuration isn't going to hit https://crbug.com/648948. |
assert(ignore_elf32_limitations || !is_android || |
(android_64bit_target_cpu && !build_apk_secondary_abi) || |
- is_component_build || symbol_level < 2 || is_clang, |
+ is_component_build || symbol_level < 2, |
"Android 32-bit non-component, non-clang builds cannot have " + |
Torne
2017/02/09 13:58:40
Should probably update the assert message to no lo
|
"symbol_level=2 due to 4GiB file size limit, see " + |
"https://crbug.com/648948. If you really want to try this out, " + |