Resolve GccTriple/ClangTriple early.
When these are Ninja variable they can't be used in android.Path since
they'll be rejected as invalid paths. We don't actually need them to be
a Ninja variable, so make them plain old strings instead.
Test: Still builds.
Change-Id: I04743cebd4b2f9be5685545f2ee941df180fce14
diff --git a/cc/mips_device.go b/cc/mips_device.go
index 0b23d37..583a153 100644
--- a/cc/mips_device.go
+++ b/cc/mips_device.go
@@ -131,8 +131,6 @@
pctx.SourcePathVariable("mipsGccRoot",
"prebuilts/gcc/${HostPrebuiltTag}/mips/mips64el-linux-android-${mipsGccVersion}")
- pctx.StaticVariable("mipsGccTriple", "mips64el-linux-android")
-
pctx.StaticVariable("mipsToolchainLdflags", strings.Join(mipsToolchainLdflags, " "))
pctx.StaticVariable("mipsCflags", strings.Join(mipsCflags, " "))
pctx.StaticVariable("mipsLdflags", strings.Join(mipsLdflags, " "))
@@ -140,7 +138,6 @@
pctx.StaticVariable("mipsIncludeFlags", bionicHeaders("mips", "mips"))
// Clang cflags
- pctx.StaticVariable("mipsClangTriple", "mipsel-linux-android")
pctx.StaticVariable("mipsClangCflags", strings.Join(clangFilterUnknownCflags(mipsClangCflags), " "))
pctx.StaticVariable("mipsClangLdflags", strings.Join(clangFilterUnknownCflags(mipsLdflags), " "))
pctx.StaticVariable("mipsClangCppflags", strings.Join(clangFilterUnknownCflags(mipsCppflags), " "))
@@ -170,7 +167,7 @@
}
func (t *toolchainMips) GccTriple() string {
- return "${mipsGccTriple}"
+ return "mips64el-linux-android"
}
func (t *toolchainMips) GccVersion() string {
@@ -202,7 +199,7 @@
}
func (t *toolchainMips) ClangTriple() string {
- return "${mipsClangTriple}"
+ return "mipsel-linux-android"
}
func (t *toolchainMips) ToolchainClangLdflags() string {