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:
Stephen Hines
2021-02-25 08:01:41 +00:00
committed by Automerger Merge Worker

View File

@@ -442,7 +442,7 @@ func (compiler *baseCompiler) compilerFlags(ctx ModuleContext, flags Flags, deps
fmt.Sprintf("${config.%sClangGlobalCflags}", hod))
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() {