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/mips_device.go b/cc/mips_device.go
index ac6f2b1..0b23d37 100644
--- a/cc/mips_device.go
+++ b/cc/mips_device.go
@@ -137,14 +137,7 @@
pctx.StaticVariable("mipsCflags", strings.Join(mipsCflags, " "))
pctx.StaticVariable("mipsLdflags", strings.Join(mipsLdflags, " "))
pctx.StaticVariable("mipsCppflags", strings.Join(mipsCppflags, " "))
- pctx.StaticVariable("mipsIncludeFlags", strings.Join([]string{
- "-isystem ${LibcRoot}/arch-mips/include",
- "-isystem ${LibcRoot}/include",
- "-isystem ${LibcRoot}/kernel/uapi",
- "-isystem ${LibcRoot}/kernel/android/uapi",
- "-isystem ${LibcRoot}/kernel/common",
- "-isystem ${LibcRoot}/kernel/uapi/asm-mips",
- }, " "))
+ pctx.StaticVariable("mipsIncludeFlags", bionicHeaders("mips", "mips"))
// Clang cflags
pctx.StaticVariable("mipsClangTriple", "mipsel-linux-android")