Remove GCC-specific toolchain methods
Test: m Change-Id: I06442347ade2d60bc42131b3126ecc17840c9e31
This commit is contained in:
@@ -69,9 +69,6 @@ func init() {
|
||||
pctx.SourcePathVariable("Mips64GccRoot",
|
||||
"prebuilts/gcc/${HostPrebuiltTag}/mips/mips64el-linux-android-${mips64GccVersion}")
|
||||
|
||||
pctx.StaticVariable("Mips64Cflags", strings.Join(mips64Cflags, " "))
|
||||
pctx.StaticVariable("Mips64Ldflags", strings.Join(mips64Ldflags, " "))
|
||||
pctx.StaticVariable("Mips64Cppflags", strings.Join(mips64Cppflags, " "))
|
||||
pctx.StaticVariable("Mips64IncludeFlags", bionicHeaders("mips"))
|
||||
|
||||
// Clang cflags
|
||||
@@ -83,7 +80,6 @@ func init() {
|
||||
|
||||
// Architecture variant cflags
|
||||
for variant, cflags := range mips64ArchVariantCflags {
|
||||
pctx.StaticVariable("Mips64"+variant+"VariantCflags", strings.Join(cflags, " "))
|
||||
pctx.StaticVariable("Mips64"+variant+"VariantClangCflags",
|
||||
strings.Join(ClangFilterUnknownCflags(cflags), " "))
|
||||
}
|
||||
@@ -91,8 +87,8 @@ func init() {
|
||||
|
||||
type toolchainMips64 struct {
|
||||
toolchain64Bit
|
||||
cflags, clangCflags string
|
||||
toolchainCflags, toolchainClangCflags string
|
||||
clangCflags string
|
||||
toolchainClangCflags string
|
||||
}
|
||||
|
||||
func (t *toolchainMips64) Name() string {
|
||||
@@ -111,22 +107,6 @@ func (t *toolchainMips64) GccVersion() string {
|
||||
return mips64GccVersion
|
||||
}
|
||||
|
||||
func (t *toolchainMips64) ToolchainCflags() string {
|
||||
return t.toolchainCflags
|
||||
}
|
||||
|
||||
func (t *toolchainMips64) Cflags() string {
|
||||
return t.cflags
|
||||
}
|
||||
|
||||
func (t *toolchainMips64) Cppflags() string {
|
||||
return "${config.Mips64Cppflags}"
|
||||
}
|
||||
|
||||
func (t *toolchainMips64) Ldflags() string {
|
||||
return "${config.Mips64Ldflags}"
|
||||
}
|
||||
|
||||
func (t *toolchainMips64) IncludeFlags() string {
|
||||
return "${config.Mips64IncludeFlags}"
|
||||
}
|
||||
@@ -166,9 +146,7 @@ func (toolchainMips64) LibclangRuntimeLibraryArch() string {
|
||||
|
||||
func mips64ToolchainFactory(arch android.Arch) Toolchain {
|
||||
return &toolchainMips64{
|
||||
cflags: "${config.Mips64Cflags}",
|
||||
clangCflags: "${config.Mips64ClangCflags}",
|
||||
toolchainCflags: "${config.Mips64" + arch.ArchVariant + "VariantCflags}",
|
||||
toolchainClangCflags: "${config.Mips64" + arch.ArchVariant + "VariantClangCflags}",
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user