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

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

Issue 2395603003: Add a ignore_elf32_limitations flag in build/config/compiler/compiler.gni (Closed)
Patch Set: address torne's comment to add is_clang Created 4 years, 2 months 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 | components/cronet/tools/cr_cronet.py » ('j') | 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 cc8f5a1472e7cfd2975790cb2de164cd51810b3d..a05c612da388d6a8f1e2f159f34dd41b044f9aa5 100644
--- a/build/config/compiler/compiler.gni
+++ b/build/config/compiler/compiler.gni
@@ -47,6 +47,11 @@ declare_args() {
#
# TODO(sebmarchand): Add support for the PGU (update) phase.
chrome_pgo_phase = 0
+
+ # Android 32-bit non-component, non-clang builds cannot have symbol_level=2
+ # due to 4GiB file size limit, see https://crbug.com/648948.
+ # Set this flag to true to skip the assertion.
+ ignore_elf32_limitations = false
}
declare_args() {
@@ -104,7 +109,8 @@ if (symbol_level == -1) {
}
# Assert that the configuration isn't going to hit https://crbug.com/648948.
-assert(!is_android || android_64bit_target_cpu || is_component_build ||
- symbol_level < 2,
- "Android 32-bit non-component builds cannot have symbol_level=2 " +
- "due to 4GiB file size limit, see https://crbug.com/648948")
+assert(ignore_elf32_limitations || !is_android || android_64bit_target_cpu ||
+ 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")
« no previous file with comments | « no previous file | components/cronet/tools/cr_cronet.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698