tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Remove implicit Bionic and kernel system includes." am: 4779327cf8 am: 6bc155429e

Browse source 
Change-Id: I6d848f25cd90abd31afa9816afd4174d07091304
This commit is contained in:
Treehugger Robot 2020-05-07 13:52:09 +00:00 committed by Automerger Merge Worker
commit 5dd4e5ecb7
6 changed files with 5 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cc/config/arm64_device.go
View file

@ -92,7 +92,6 @@ func init() {
pctx.StaticVariable("Arm64Ldflags", strings.Join(arm64Ldflags, " "))
pctx.StaticVariable("Arm64Lldflags", strings.Join(arm64Lldflags, " "))
pctx.StaticVariable("Arm64IncludeFlags", bionicHeaders("arm64"))
pctx.StaticVariable("Arm64ClangCflags", strings.Join(ClangFilterUnknownCflags(arm64Cflags), " "))
pctx.StaticVariable("Arm64ClangLdflags", strings.Join(ClangFilterUnknownCflags(arm64Ldflags), " "))
@ -164,7 +163,7 @@ func (t *toolchainArm64) GccVersion() string {
}
func (t *toolchainArm64) IncludeFlags() string {
return "${config.Arm64IncludeFlags}"
return ""
}
func (t *toolchainArm64) ClangTriple() string {

3
cc/config/arm_device.go
View file

@ -175,7 +175,6 @@ func init() {
pctx.StaticVariable("ArmLdflags", strings.Join(armLdflags, " "))
pctx.StaticVariable("ArmLldflags", strings.Join(armLldflags, " "))
pctx.StaticVariable("ArmIncludeFlags", bionicHeaders("arm"))
// Clang cflags
pctx.StaticVariable("ArmToolchainClangCflags", strings.Join(ClangFilterUnknownCflags(armToolchainCflags), " "))
@ -269,7 +268,7 @@ func (t *toolchainArm) GccVersion() string {
}
func (t *toolchainArm) IncludeFlags() string {
return "${config.ArmIncludeFlags}"
return ""
}
func (t *toolchainArm) ClangTriple() string {

10
cc/config/global.go
View file

@ -265,16 +265,6 @@ func init() {
var HostPrebuiltTag = pctx.VariableConfigMethod("HostPrebuiltTag", android.Config.PrebuiltOS)
func bionicHeaders(kernelArch string) string {
return strings.Join([]string{
"-isystem bionic/libc/include",
"-isystem bionic/libc/kernel/uapi",
"-isystem bionic/libc/kernel/uapi/asm-" + kernelArch,
"-isystem bionic/libc/kernel/android/scsi",
"-isystem bionic/libc/kernel/android/uapi",
}, " ")
}
func envOverrideFunc(envVar, defaultVal string) func(ctx android.PackageVarContext) string {
return func(ctx android.PackageVarContext) string {
if override := ctx.Config().Getenv(envVar); override != "" {

3
cc/config/x86_64_device.go
View file

@ -103,7 +103,6 @@ func init() {
pctx.StaticVariable("X86_64Ldflags", strings.Join(x86_64Ldflags, " "))
pctx.StaticVariable("X86_64Lldflags", strings.Join(x86_64Lldflags, " "))
pctx.StaticVariable("X86_64IncludeFlags", bionicHeaders("x86"))
// Clang cflags
pctx.StaticVariable("X86_64ClangCflags", strings.Join(ClangFilterUnknownCflags(x86_64Cflags), " "))
@ -145,7 +144,7 @@ func (t *toolchainX86_64) GccVersion() string {
}
func (t *toolchainX86_64) IncludeFlags() string {
return "${config.X86_64IncludeFlags}"
return ""
}
func (t *toolchainX86_64) ClangTriple() string {

3
cc/config/x86_device.go
View file

@ -114,7 +114,6 @@ func init() {
pctx.StaticVariable("X86Ldflags", strings.Join(x86Ldflags, " "))
pctx.StaticVariable("X86Lldflags", strings.Join(x86Lldflags, " "))
pctx.StaticVariable("X86IncludeFlags", bionicHeaders("x86"))
// Clang cflags
pctx.StaticVariable("X86ClangCflags", strings.Join(ClangFilterUnknownCflags(x86ClangCflags), " "))
@ -156,7 +155,7 @@ func (t *toolchainX86) GccVersion() string {
}
func (t *toolchainX86) IncludeFlags() string {
return "${config.X86IncludeFlags}"
return ""
}
func (t *toolchainX86) ClangTriple() string {

4
cc/config/x86_linux_bionic_host.go
View file

@ -70,8 +70,6 @@ func init() {
pctx.StaticVariable("LinuxBionicLdflags", strings.Join(linuxBionicLdflags, " "))
pctx.StaticVariable("LinuxBionicLldflags", strings.Join(linuxBionicLldflags, " "))
pctx.StaticVariable("LinuxBionicIncludeFlags", bionicHeaders("x86"))
// Use the device gcc toolchain for now
pctx.StaticVariable("LinuxBionicGccRoot", "${X86_64GccRoot}")
}
@ -97,7 +95,7 @@ func (t *toolchainLinuxBionic) GccVersion() string {
}
func (t *toolchainLinuxBionic) IncludeFlags() string {
return "${config.LinuxBionicIncludeFlags}"
return ""
}
func (t *toolchainLinuxBionic) ClangTriple() string {