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

Unified Diff: build/config/android/BUILD.gn

Issue 1368223002: [GN]: BUILD file housecleaning (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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 | « build/config/BUILD.gn ('k') | build/config/compiler/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/android/BUILD.gn
diff --git a/build/config/android/BUILD.gn b/build/config/android/BUILD.gn
index 0514b43e73b308e967227404bad6e1cccb44822f..db6b7a8bb8d3175e1560f4cf087cf1b4ec535157 100644
--- a/build/config/android/BUILD.gn
+++ b/build/config/android/BUILD.gn
@@ -115,6 +115,10 @@ config("compiler") {
abi_target,
]
}
+
+ # Assign any flags set for the C compiler to asmflags so that they are sent
+ # to the assembler.
+ asmflags = cflags
}
# This is included by reference in the //build/config/compiler:runtime_library
@@ -194,6 +198,7 @@ config("runtime_library") {
config("sdk") {
if (sysroot != "") {
cflags = [ "--sysroot=" + sysroot ]
+ asmflags = [ "--sysroot=" + sysroot ]
ldflags = [ "--sysroot=" + sysroot ]
# Need to get some linker flags out of the sysroot.
@@ -209,6 +214,7 @@ config("sdk") {
config("executable_config") {
cflags = [ "-fPIE" ]
+ asmflags = [ "-fPIE" ]
ldflags = [ "-pie" ]
}
« no previous file with comments | « build/config/BUILD.gn ('k') | build/config/compiler/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698