Refactor bionic includes into a single place
Bionic includes are the same on all architectures, modulo
architecture-specific includes. Use a single function to populate the
list, passing in bionic's and the kernel's names for the architecture.
Also get rid of the ${LibcRoot} variable, it is not providing any value
and makes grepping harder.
Change-Id: I39e7907d312f52dd1378a3937ab1bcba12c4e97f
diff --git a/cc/x86_64_device.go b/cc/x86_64_device.go
index a795ba7..6923f5f 100644
--- a/cc/x86_64_device.go
+++ b/cc/x86_64_device.go
@@ -148,14 +148,7 @@
pctx.StaticVariable("x86_64Cflags", strings.Join(x86_64Cflags, " "))
pctx.StaticVariable("x86_64Ldflags", strings.Join(x86_64Ldflags, " "))
pctx.StaticVariable("x86_64Cppflags", strings.Join(x86_64Cppflags, " "))
- pctx.StaticVariable("x86_64IncludeFlags", strings.Join([]string{
- "-isystem ${LibcRoot}/arch-x86_64/include",
- "-isystem ${LibcRoot}/include",
- "-isystem ${LibcRoot}/kernel/uapi",
- "-isystem ${LibcRoot}/kernel/android/uapi",
- "-isystem ${LibcRoot}/kernel/common",
- "-isystem ${LibcRoot}/kernel/uapi/asm-x86",
- }, " "))
+ pctx.StaticVariable("x86_64IncludeFlags", bionicHeaders("x86_64", "x86"))
// Clang cflags
pctx.StaticVariable("x86_64ClangCflags", strings.Join(clangFilterUnknownCflags(x86_64Cflags), " "))