Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4779327c authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Remove implicit Bionic and kernel system includes."

parents 9d902cef 41ab2519

cc/config/arm64_device.go

+1 −2
Original line number Diff line number Diff line
@@ -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 {

cc/config/arm_device.go

+1 −2
Original line number Diff line number Diff line
@@ -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 {

cc/config/global.go

+0 −10
Original line number Diff line number Diff line
@@ -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 != "" {

cc/config/x86_64_device.go

+1 −2
Original line number Diff line number Diff line
@@ -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 {

cc/config/x86_device.go

+1 −2
Original line number Diff line number Diff line
@@ -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 {