Created
January 7, 2019 23:04
-
-
Save sgraham/2e33ae36db6255af0be0785ea3d0b058 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni | |
index add2ce20281b..1312dcb6a14c 100644 | |
--- a/build/config/android/rules.gni | |
+++ b/build/config/android/rules.gni | |
@@ -2137,7 +2137,8 @@ if (enable_java_templates) { | |
} | |
} | |
- if (_shared_libraries_is_valid || _secondary_abi_shared_libraries_is_valid) { | |
+ if (_shared_libraries_is_valid || | |
+ _secondary_abi_shared_libraries_is_valid) { | |
_native_lib_version_rule = "" | |
if (defined(invoker.native_lib_version_rule)) { | |
_native_lib_version_rule = invoker.native_lib_version_rule | |
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn | |
index 91e3033ec161..66db6429017a 100644 | |
--- a/build/config/compiler/BUILD.gn | |
+++ b/build/config/compiler/BUILD.gn | |
@@ -520,7 +520,8 @@ config("compiler") { | |
} | |
# Makes builds independent of absolute file path. | |
- if (symbol_level != 0 && is_clang && strip_absolute_paths_from_debug_symbols) { | |
+ if (symbol_level != 0 && is_clang && | |
+ strip_absolute_paths_from_debug_symbols) { | |
# If debug option is given, clang includes $cwd in debug info by default. | |
# For such build, this flag generates reproducible obj files even we use | |
# different build directory like "out/feature_a" and "out/feature_b" if | |
@@ -1175,7 +1176,8 @@ config("compiler_arm") { | |
config("assembler_debug_dir") { | |
# TODO(thakis): Once openmax_dl no longer uses -fno-integrated-as, move | |
# this behind the -fdebug-compilation-dir cflags in the "compiler" config. | |
- if (symbol_level != 0 && is_clang && strip_absolute_paths_from_debug_symbols) { | |
+ if (symbol_level != 0 && is_clang && | |
+ strip_absolute_paths_from_debug_symbols) { | |
if (!is_win && target_os != "chromeos") { | |
# We don't use clang -cc1as on Windows (yet? https://crbug.com/762167) | |
# Chrome OS's clang doesn't know this flag yet, https://crbug.com/917357 | |
@@ -2169,7 +2171,8 @@ config("afdo") { | |
_clang_sample_profile, | |
] | |
} | |
- } else if (auto_profile_path != "" && current_toolchain == default_toolchain) { | |
+ } else if (auto_profile_path != "" && | |
+ current_toolchain == default_toolchain) { | |
cflags = [ "-fauto-profile=${auto_profile_path}" ] | |
inputs = [ | |
auto_profile_path, | |
diff --git a/build/toolchain/cros/BUILD.gn b/build/toolchain/cros/BUILD.gn | |
index 72db898c9cf0..a0bf39a44047 100644 | |
--- a/build/toolchain/cros/BUILD.gn | |
+++ b/build/toolchain/cros/BUILD.gn | |
@@ -18,7 +18,8 @@ gcc_toolchain("target") { | |
if (cc != get_path_info(cc, "file") && string_replace(cc, " ", "") == cc) { | |
cc = rebase_path(cc, root_build_dir) | |
} | |
- if (cxx != get_path_info(cxx, "file") && string_replace(cxx, " ", "") == cxx) { | |
+ if (cxx != get_path_info(cxx, "file") && | |
+ string_replace(cxx, " ", "") == cxx) { | |
cxx = rebase_path(cxx, root_build_dir) | |
} | |
@@ -62,7 +63,8 @@ gcc_toolchain("nacl_bootstrap") { | |
if (cc != get_path_info(cc, "file") && string_replace(cc, " ", "") == cc) { | |
cc = rebase_path(cc, root_build_dir) | |
} | |
- if (cxx != get_path_info(cxx, "file") && string_replace(cxx, " ", "") == cxx) { | |
+ if (cxx != get_path_info(cxx, "file") && | |
+ string_replace(cxx, " ", "") == cxx) { | |
cxx = rebase_path(cxx, root_build_dir) | |
} | |
ld = cxx | |
@@ -102,7 +104,8 @@ gcc_toolchain("host") { | |
if (cc != get_path_info(cc, "file") && string_replace(cc, " ", "") == cc) { | |
cc = rebase_path(cc, root_build_dir) | |
} | |
- if (cxx != get_path_info(cxx, "file") && string_replace(cxx, " ", "") == cxx) { | |
+ if (cxx != get_path_info(cxx, "file") && | |
+ string_replace(cxx, " ", "") == cxx) { | |
cxx = rebase_path(cxx, root_build_dir) | |
} | |
ld = cxx | |
@@ -140,7 +143,8 @@ gcc_toolchain("v8_snapshot") { | |
if (cc != get_path_info(cc, "file") && string_replace(cc, " ", "") == cc) { | |
cc = rebase_path(cc, root_build_dir) | |
} | |
- if (cxx != get_path_info(cxx, "file") && string_replace(cxx, " ", "") == cxx) { | |
+ if (cxx != get_path_info(cxx, "file") && | |
+ string_replace(cxx, " ", "") == cxx) { | |
cxx = rebase_path(cxx, root_build_dir) | |
} | |
ld = cxx |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment