From 41ab2519b46ec33ddf26b38ebc1ed3dc197babde Mon Sep 17 00:00:00 2001 From: Martin Stjernholm Date: Wed, 8 Apr 2020 01:06:07 +0100 Subject: [PATCH] Remove implicit Bionic and kernel system includes. They are now explicit in the Bionic blueprints, and brought in through dependencies on libc (which in turn is usually implicit through the default system_shared_libs value). Modules that may break are cc_object which don't depend on system_shared_libs, and those that explicitly set system_shared_libs:[] but still assumes libc headers. In either case the fix should be to add header_libs:["libc_headers"]. Test: Build and boot Test: m checkbuild (on aosp_taimen and aosp_x86_64) Bug: 153590472 Change-Id: I3217d8f36e49a987f5377866c8647f9dcccc37ce --- cc/config/arm64_device.go | 3 +-- cc/config/arm_device.go | 3 +-- cc/config/global.go | 10 ---------- cc/config/x86_64_device.go | 3 +-- cc/config/x86_device.go | 3 +-- cc/config/x86_linux_bionic_host.go | 4 +--- 6 files changed, 5 insertions(+), 21 deletions(-) diff --git a/cc/config/arm64_device.go b/cc/config/arm64_device.go index 5575baaab..93834630c 100644 --- a/cc/config/arm64_device.go +++ b/cc/config/arm64_device.go @@ -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 { diff --git a/cc/config/arm_device.go b/cc/config/arm_device.go index d37e48620..f01c63882 100644 --- a/cc/config/arm_device.go +++ b/cc/config/arm_device.go @@ -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 { diff --git a/cc/config/global.go b/cc/config/global.go index 923dd2956..4e51ae924 100644 --- a/cc/config/global.go +++ b/cc/config/global.go @@ -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 != "" { diff --git a/cc/config/x86_64_device.go b/cc/config/x86_64_device.go index bcfae5d4d..1e25a3b8f 100644 --- a/cc/config/x86_64_device.go +++ b/cc/config/x86_64_device.go @@ -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 { diff --git a/cc/config/x86_device.go b/cc/config/x86_device.go index 64392dc86..fe830982f 100644 --- a/cc/config/x86_device.go +++ b/cc/config/x86_device.go @@ -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 { diff --git a/cc/config/x86_linux_bionic_host.go b/cc/config/x86_linux_bionic_host.go index fb1cdebe4..fa625e34a 100644 --- a/cc/config/x86_linux_bionic_host.go +++ b/cc/config/x86_linux_bionic_host.go @@ -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 {