Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2e020842 authored by Stephen Hines's avatar Stephen Hines Committed by Gerrit Code Review
Browse files

Merge "Remove unnecessary DeviceUsesClang."

parents 2835af80 6ea0f81c

android/config.go

+0 −7
Original line number Diff line number Diff line
@@ -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

android/variable.go

+0 −2
Original line number Diff line number Diff line
@@ -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"),

cc/cc.go

+1 −7
Original line number Diff line number Diff line
@@ -947,15 +947,9 @@ 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

		}

	}



	if !c.toolchain(ctx).ClangSupported() {

		clang = false

	}

scripts/build-ndk-prebuilts.sh

+0 −1
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ cat > ${SOONG_OUT}/soong.variables << EOF 
    "DeviceAbi": [

        "arm64-v8a"

    ],

    "DeviceUsesClang": true,

    "DeviceSecondaryArch": "arm",

    "DeviceSecondaryArchVariant": "armv7-a-neon",

    "DeviceSecondaryCpuVariant": "denver",