Remove Fuchsia support from Soong (cb0ac95b) · Commits · e / os / android_build_soong

android/arch.go

+3 −9

Original line number	Original line	Diff line number	Diff line
	@@ -15,13 +15,14 @@
	package android		package android

	import (		import (
	"android/soong/bazel"
	"encoding"		"encoding"
	"fmt"		"fmt"
	"reflect"		"reflect"
	"runtime"		"runtime"
	"strings"		"strings"

			"android/soong/bazel"

	"github.com/google/blueprint"		"github.com/google/blueprint"
	"github.com/google/blueprint/bootstrap"		"github.com/google/blueprint/bootstrap"
	"github.com/google/blueprint/proptools"		"github.com/google/blueprint/proptools"
	@@ -314,8 +315,6 @@ var (
	// Android is the OS for target devices that run all of Android, including the Linux kernel		// Android is the OS for target devices that run all of Android, including the Linux kernel
	// and the Bionic libc runtime.		// and the Bionic libc runtime.
	Android = newOsType("android", Device, false, Arm, Arm64, X86, X86_64)		Android = newOsType("android", Device, false, Arm, Arm64, X86, X86_64)
	// Fuchsia is the OS for target devices that run Fuchsia.
	Fuchsia = newOsType("fuchsia", Device, false, Arm64, X86_64)

	// CommonOS is a pseudo OSType for a common OS variant, which is OsType agnostic and which		// CommonOS is a pseudo OSType for a common OS variant, which is OsType agnostic and which
	// has dependencies on all the OS variants.		// has dependencies on all the OS variants.
	@@ -1502,13 +1501,8 @@ func decodeTargetProductVariables(config *config) (map[OsType][]Target, error) {

	// Optional device targets		// Optional device targets
	if variables.DeviceArch != nil && *variables.DeviceArch != "" {		if variables.DeviceArch != nil && *variables.DeviceArch != "" {
	var target = Android
	if Bool(variables.Fuchsia) {
	target = Fuchsia
	}

	// The primary device target.		// The primary device target.
	addTarget(target, *variables.DeviceArch, variables.DeviceArchVariant,		addTarget(Android, *variables.DeviceArch, variables.DeviceArchVariant,
	variables.DeviceCpuVariant, variables.DeviceAbi, NativeBridgeDisabled, nil, nil)		variables.DeviceCpuVariant, variables.DeviceAbi, NativeBridgeDisabled, nil, nil)

	// An optional secondary device target.		// An optional secondary device target.

android/config.go

+0 −19

Original line number	Original line	Diff line number	Diff line
	@@ -332,21 +332,6 @@ func TestConfig(buildDir string, env map[string]string, bp string, fs map[string
	return Config{config}		return Config{config}
	}		}

	func fuchsiaTargets(config Config) map[OsType][]Target {
	return map[OsType][]Target{
	Fuchsia: {
	{Fuchsia, Arch{ArchType: Arm64, ArchVariant: "", Abi: []string{"arm64-v8a"}}, NativeBridgeDisabled, "", "", false},
	},
	config.BuildOS: {
	{config.BuildOS, Arch{ArchType: X86_64}, NativeBridgeDisabled, "", "", false},
	},
	}
	}

	var PrepareForTestSetDeviceToFuchsia = FixtureModifyConfig(func(config Config) {
	config.Targets = fuchsiaTargets(config)
	})

	func modifyTestConfigToSupportArchMutator(testConfig Config) {		func modifyTestConfigToSupportArchMutator(testConfig Config) {
	config := testConfig.config		config := testConfig.config

	@@ -847,10 +832,6 @@ func (c *config) SkipBootJarsCheck() bool {
	return Bool(c.productVariables.Skip_boot_jars_check)		return Bool(c.productVariables.Skip_boot_jars_check)
	}		}

	func (c *config) Fuchsia() bool {
	return Bool(c.productVariables.Fuchsia)
	}

	func (c *config) MinimizeJavaDebugInfo() bool {		func (c *config) MinimizeJavaDebugInfo() bool {
	return Bool(c.productVariables.MinimizeJavaDebugInfo) && !Bool(c.productVariables.Eng)		return Bool(c.productVariables.MinimizeJavaDebugInfo) && !Bool(c.productVariables.Eng)
	}		}

android/module.go

+0 −5

Original line number	Original line	Diff line number	Diff line
	@@ -325,7 +325,6 @@ type BaseModuleContext interface {
	Host() bool		Host() bool
	Device() bool		Device() bool
	Darwin() bool		Darwin() bool
	Fuchsia() bool
	Windows() bool		Windows() bool
	Debug() bool		Debug() bool
	PrimaryArch() bool		PrimaryArch() bool
	@@ -2563,10 +2562,6 @@ func (b *baseModuleContext) Darwin() bool {
	return b.os == Darwin		return b.os == Darwin
	}		}

	func (b *baseModuleContext) Fuchsia() bool {
	return b.os == Fuchsia
	}

	func (b *baseModuleContext) Windows() bool {		func (b *baseModuleContext) Windows() bool {
	return b.os == Windows		return b.os == Windows
	}		}

android/variable.go

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -299,8 +299,6 @@ type productVariables struct {

	Override_rs_driver *string `json:",omitempty"`		Override_rs_driver *string `json:",omitempty"`

	Fuchsia *bool `json:",omitempty"`

	DeviceKernelHeaders []string `json:",omitempty"`		DeviceKernelHeaders []string `json:",omitempty"`

	ExtraVndkVersions []string `json:",omitempty"`		ExtraVndkVersions []string `json:",omitempty"`

bazel/configurability.go

+0 −6

Original line number	Original line	Diff line number	Diff line
	@@ -29,7 +29,6 @@ const (
	// OsType names in arch.go		// OsType names in arch.go
	osAndroid = "android"		osAndroid = "android"
	osDarwin = "darwin"		osDarwin = "darwin"
	osFuchsia = "fuchsia"
	osLinux = "linux_glibc"		osLinux = "linux_glibc"
	osLinuxBionic = "linux_bionic"		osLinuxBionic = "linux_bionic"
	osWindows = "windows"		osWindows = "windows"
	@@ -40,8 +39,6 @@ const (
	osArchAndroidX86 = "android_x86"		osArchAndroidX86 = "android_x86"
	osArchAndroidX86_64 = "android_x86_64"		osArchAndroidX86_64 = "android_x86_64"
	osArchDarwinX86_64 = "darwin_x86_64"		osArchDarwinX86_64 = "darwin_x86_64"
	osArchFuchsiaArm64 = "fuchsia_arm64"
	osArchFuchsiaX86_64 = "fuchsia_x86_64"
	osArchLinuxX86 = "linux_glibc_x86"		osArchLinuxX86 = "linux_glibc_x86"
	osArchLinuxX86_64 = "linux_glibc_x86_64"		osArchLinuxX86_64 = "linux_glibc_x86_64"
	osArchLinuxBionicArm64 = "linux_bionic_arm64"		osArchLinuxBionicArm64 = "linux_bionic_arm64"
	@@ -84,7 +81,6 @@ var (
	platformOsMap = map[string]string{		platformOsMap = map[string]string{
	osAndroid: "//build/bazel/platforms/os:android",		osAndroid: "//build/bazel/platforms/os:android",
	osDarwin: "//build/bazel/platforms/os:darwin",		osDarwin: "//build/bazel/platforms/os:darwin",
	osFuchsia: "//build/bazel/platforms/os:fuchsia",
	osLinux: "//build/bazel/platforms/os:linux",		osLinux: "//build/bazel/platforms/os:linux",
	osLinuxBionic: "//build/bazel/platforms/os:linux_bionic",		osLinuxBionic: "//build/bazel/platforms/os:linux_bionic",
	osWindows: "//build/bazel/platforms/os:windows",		osWindows: "//build/bazel/platforms/os:windows",
	@@ -102,8 +98,6 @@ var (
	osArchAndroidX86: "//build/bazel/platforms/os_arch:android_x86",		osArchAndroidX86: "//build/bazel/platforms/os_arch:android_x86",
	osArchAndroidX86_64: "//build/bazel/platforms/os_arch:android_x86_64",		osArchAndroidX86_64: "//build/bazel/platforms/os_arch:android_x86_64",
	osArchDarwinX86_64: "//build/bazel/platforms/os_arch:darwin_x86_64",		osArchDarwinX86_64: "//build/bazel/platforms/os_arch:darwin_x86_64",
	osArchFuchsiaArm64: "//build/bazel/platforms/os_arch:fuchsia_arm64",
	osArchFuchsiaX86_64: "//build/bazel/platforms/os_arch:fuchsia_x86_64",
	osArchLinuxX86: "//build/bazel/platforms/os_arch:linux_glibc_x86",		osArchLinuxX86: "//build/bazel/platforms/os_arch:linux_glibc_x86",
	osArchLinuxX86_64: "//build/bazel/platforms/os_arch:linux_glibc_x86_64",		osArchLinuxX86_64: "//build/bazel/platforms/os_arch:linux_glibc_x86_64",
	osArchLinuxBionicArm64: "//build/bazel/platforms/os_arch:linux_bionic_arm64",		osArchLinuxBionicArm64: "//build/bazel/platforms/os_arch:linux_bionic_arm64",