Remove unnecessary DeviceUsesClang.

This build function is unnecessary now that GCC is completely
unsupported for Android platform builds. It is similar to
USE_CLANG_PLATFORM_BUILD from the build/make side of things.

Bug: http://b/64032869
Test: Builds
Change-Id: Iddf5f91cc997c337c77a644265cb8dc4e5a915b4
This commit is contained in:
Stephen Hines
2018-01-11 11:56:19 -08:00
parent 4acd66ae94
commit 6ea0f81c3f
4 changed files with 1 additions and 17 deletions

View File

@@ -430,13 +430,6 @@ func (c *config) DeviceName() string {
return *c.ProductVariables.DeviceName return *c.ProductVariables.DeviceName
} }
func (c *config) DeviceUsesClang() bool {
if c.ProductVariables.DeviceUsesClang != nil {
return *c.ProductVariables.DeviceUsesClang
}
return true
}
func (c *config) ResourceOverlays() []string { func (c *config) ResourceOverlays() []string {
if c.ProductVariables.ResourceOverlays == nil { if c.ProductVariables.ResourceOverlays == nil {
return nil return nil

View File

@@ -121,7 +121,6 @@ type productVariables struct {
DeviceArchVariant *string `json:",omitempty"` DeviceArchVariant *string `json:",omitempty"`
DeviceCpuVariant *string `json:",omitempty"` DeviceCpuVariant *string `json:",omitempty"`
DeviceAbi *[]string `json:",omitempty"` DeviceAbi *[]string `json:",omitempty"`
DeviceUsesClang *bool `json:",omitempty"`
DeviceVndkVersion *string `json:",omitempty"` DeviceVndkVersion *string `json:",omitempty"`
DeviceSecondaryArch *string `json:",omitempty"` DeviceSecondaryArch *string `json:",omitempty"`
@@ -231,7 +230,6 @@ func (v *productVariables) SetDefaultConfig() {
DeviceArchVariant: stringPtr("armv8-a"), DeviceArchVariant: stringPtr("armv8-a"),
DeviceCpuVariant: stringPtr("generic"), DeviceCpuVariant: stringPtr("generic"),
DeviceAbi: &[]string{"arm64-v8a"}, DeviceAbi: &[]string{"arm64-v8a"},
DeviceUsesClang: boolPtr(true),
DeviceSecondaryArch: stringPtr("arm"), DeviceSecondaryArch: stringPtr("arm"),
DeviceSecondaryArchVariant: stringPtr("armv8-a"), DeviceSecondaryArchVariant: stringPtr("armv8-a"),
DeviceSecondaryCpuVariant: stringPtr("generic"), DeviceSecondaryCpuVariant: stringPtr("generic"),

View File

@@ -947,13 +947,7 @@ func (c *Module) clang(ctx BaseModuleContext) bool {
clang := Bool(c.Properties.Clang) clang := Bool(c.Properties.Clang)
if c.Properties.Clang == nil { if c.Properties.Clang == nil {
if ctx.Host() { clang = true
clang = true
}
if ctx.Device() && ctx.Config().DeviceUsesClang() {
clang = true
}
} }
if !c.toolchain(ctx).ClangSupported() { if !c.toolchain(ctx).ClangSupported() {

View File

@@ -55,7 +55,6 @@ cat > ${SOONG_OUT}/soong.variables << EOF
"DeviceAbi": [ "DeviceAbi": [
"arm64-v8a" "arm64-v8a"
], ],
"DeviceUsesClang": true,
"DeviceSecondaryArch": "arm", "DeviceSecondaryArch": "arm",
"DeviceSecondaryArchVariant": "armv7-a-neon", "DeviceSecondaryArchVariant": "armv7-a-neon",
"DeviceSecondaryCpuVariant": "denver", "DeviceSecondaryCpuVariant": "denver",