Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(795)

Unified Diff: build/config/compiler/compiler.gni

Issue 2481523002: Android: Default symbol_level=1 for GN configs where 2 breaks things (Closed)
Patch Set: add build_apk_secondary_abi Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/compiler/compiler.gni
diff --git a/build/config/compiler/compiler.gni b/build/config/compiler/compiler.gni
index fa097036c15e54a17835d6adfd992bada8760198..0fad7c5f1271586ef7838ba995b2a94c3eccaf4f 100644
--- a/build/config/compiler/compiler.gni
+++ b/build/config/compiler/compiler.gni
@@ -77,6 +77,11 @@ 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 &&
+ !(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.
+ symbol_level = 1
} else if (is_win && use_goma && !is_clang) {
# goma doesn't support PDB files, so we disable symbols during goma
# compilation because otherwise the redundant debug information generated
@@ -98,8 +103,10 @@ 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 ||
+assert(ignore_elf32_limitations || !is_android ||
+ (android_64bit_target_cpu && !build_apk_secondary_abi) ||
is_component_build || symbol_level < 2 || is_clang,
"Android 32-bit non-component, non-clang builds cannot have " +
"symbol_level=2 due to 4GiB file size limit, see " +
- "https://crbug.com/648948")
+ "https://crbug.com/648948. If you really want to try this out, " +
+ "set ignore_elf32_limitations=true.")
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698