Remove clang: false support am: 742a5453c2

am: 4713e25788

Change-Id: Ib39f9ad249a632ac4d8024a5c37a29f096c6ae1f
This commit is contained in:
Dan Willemsen
2018-07-23 19:26:00 -07:00
committed by android-build-merger
2 changed files with 9 additions and 8 deletions

View File

@@ -159,9 +159,12 @@ type ObjectLinkerProperties struct {
// Properties used to compile all C or C++ modules
type BaseProperties struct {
// compile module with clang instead of gcc
// Deprecated. true is the default, false is invalid.
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
Sdk_version *string
@@ -1080,17 +1083,15 @@ func beginMutator(ctx android.BottomUpMutatorContext) {
}
func (c *Module) clang(ctx BaseModuleContext) bool {
clang := Bool(c.Properties.Clang)
if c.Properties.Clang == nil {
clang = true
if c.Properties.Clang != nil && *c.Properties.Clang == false {
ctx.PropertyErrorf("clang", "false (GCC) is no longer supported")
}
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

View File

@@ -43,7 +43,7 @@ func toolchainLibraryFactory() android.Module {
}
module.compiler = toolchainLibrary
module.linker = toolchainLibrary
module.Properties.Clang = BoolPtr(false)
module.Properties.Gcc = true
module.stl = nil
module.sanitize = nil
module.installer = nil