Merge "reverses common and external Clang flags" am: f3e0d22234
am: 4ad07ba7a3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1606997 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0e80e9e944072ebc4617ab1213111df79603d811
This commit is contained in:
@@ -442,7 +442,7 @@ func (compiler *baseCompiler) compilerFlags(ctx ModuleContext, flags Flags, deps
|
|||||||
fmt.Sprintf("${config.%sClangGlobalCflags}", hod))
|
fmt.Sprintf("${config.%sClangGlobalCflags}", hod))
|
||||||
|
|
||||||
if isThirdParty(modulePath) {
|
if isThirdParty(modulePath) {
|
||||||
flags.Global.CommonFlags = append([]string{"${config.ClangExternalCflags}"}, flags.Global.CommonFlags...)
|
flags.Global.CommonFlags = append(flags.Global.CommonFlags, "${config.ClangExternalCflags}")
|
||||||
}
|
}
|
||||||
|
|
||||||
if tc.Bionic() {
|
if tc.Bionic() {
|
||||||
|
Reference in New Issue
Block a user