diff options
| -rw-r--r-- | android/config.go | 7 | ||||
| -rw-r--r-- | android/variable.go | 2 | ||||
| -rw-r--r-- | cc/cc.go | 8 | ||||
| -rwxr-xr-x | scripts/build-ndk-prebuilts.sh | 1 |
4 files changed, 1 insertions, 17 deletions
diff --git a/android/config.go b/android/config.go index 630785b8b..43d743b6b 100644 --- a/android/config.go +++ b/android/config.go @@ -430,13 +430,6 @@ func (c *config) DeviceName() string { 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 { if c.ProductVariables.ResourceOverlays == nil { return nil diff --git a/android/variable.go b/android/variable.go index 6962b0fcb..d58ed6a9f 100644 --- a/android/variable.go +++ b/android/variable.go @@ -121,7 +121,6 @@ type productVariables struct { DeviceArchVariant *string `json:",omitempty"` DeviceCpuVariant *string `json:",omitempty"` DeviceAbi *[]string `json:",omitempty"` - DeviceUsesClang *bool `json:",omitempty"` DeviceVndkVersion *string `json:",omitempty"` DeviceSecondaryArch *string `json:",omitempty"` @@ -231,7 +230,6 @@ func (v *productVariables) SetDefaultConfig() { DeviceArchVariant: stringPtr("armv8-a"), DeviceCpuVariant: stringPtr("generic"), DeviceAbi: &[]string{"arm64-v8a"}, - DeviceUsesClang: boolPtr(true), DeviceSecondaryArch: stringPtr("arm"), DeviceSecondaryArchVariant: stringPtr("armv8-a"), DeviceSecondaryCpuVariant: stringPtr("generic"), @@ -947,13 +947,7 @@ func (c *Module) clang(ctx BaseModuleContext) bool { clang := Bool(c.Properties.Clang) if c.Properties.Clang == nil { - if ctx.Host() { - clang = true - } - - if ctx.Device() && ctx.Config().DeviceUsesClang() { - clang = true - } + clang = true } if !c.toolchain(ctx).ClangSupported() { diff --git a/scripts/build-ndk-prebuilts.sh b/scripts/build-ndk-prebuilts.sh index 55214b2f6..d15045190 100755 --- a/scripts/build-ndk-prebuilts.sh +++ b/scripts/build-ndk-prebuilts.sh @@ -55,7 +55,6 @@ cat > ${SOONG_OUT}/soong.variables << EOF "DeviceAbi": [ "arm64-v8a" ], - "DeviceUsesClang": true, "DeviceSecondaryArch": "arm", "DeviceSecondaryArchVariant": "armv7-a-neon", "DeviceSecondaryCpuVariant": "denver", |