Remove clang: false
support
am: 742a5453c2
Change-Id: Idcb738ca7cb39882157f36ca44ef492fe2a8b0a0
This commit is contained in:
15
cc/cc.go
15
cc/cc.go
@@ -159,9 +159,12 @@ type ObjectLinkerProperties struct {
|
|||||||
|
|
||||||
// Properties used to compile all C or C++ modules
|
// Properties used to compile all C or C++ modules
|
||||||
type BaseProperties struct {
|
type BaseProperties struct {
|
||||||
// compile module with clang instead of gcc
|
// Deprecated. true is the default, false is invalid.
|
||||||
Clang *bool `android:"arch_variant"`
|
Clang *bool `android:"arch_variant"`
|
||||||
|
|
||||||
|
// Some internals still need GCC (toolchain_library)
|
||||||
|
Gcc bool `blueprint:"mutated"`
|
||||||
|
|
||||||
// Minimum sdk version supported when compiling against the ndk
|
// Minimum sdk version supported when compiling against the ndk
|
||||||
Sdk_version *string
|
Sdk_version *string
|
||||||
|
|
||||||
@@ -1080,17 +1083,15 @@ func beginMutator(ctx android.BottomUpMutatorContext) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (c *Module) clang(ctx BaseModuleContext) bool {
|
func (c *Module) clang(ctx BaseModuleContext) bool {
|
||||||
clang := Bool(c.Properties.Clang)
|
if c.Properties.Clang != nil && *c.Properties.Clang == false {
|
||||||
|
ctx.PropertyErrorf("clang", "false (GCC) is no longer supported")
|
||||||
if c.Properties.Clang == nil {
|
|
||||||
clang = true
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if !c.toolchain(ctx).ClangSupported() {
|
if !c.toolchain(ctx).ClangSupported() {
|
||||||
clang = false
|
panic("GCC is no longer supported")
|
||||||
}
|
}
|
||||||
|
|
||||||
return clang
|
return !c.Properties.Gcc
|
||||||
}
|
}
|
||||||
|
|
||||||
// Whether a module can link to another module, taking into
|
// Whether a module can link to another module, taking into
|
||||||
|
@@ -43,7 +43,7 @@ func toolchainLibraryFactory() android.Module {
|
|||||||
}
|
}
|
||||||
module.compiler = toolchainLibrary
|
module.compiler = toolchainLibrary
|
||||||
module.linker = toolchainLibrary
|
module.linker = toolchainLibrary
|
||||||
module.Properties.Clang = BoolPtr(false)
|
module.Properties.Gcc = true
|
||||||
module.stl = nil
|
module.stl = nil
|
||||||
module.sanitize = nil
|
module.sanitize = nil
|
||||||
module.installer = nil
|
module.installer = nil
|
||||||
|
Reference in New Issue
Block a user