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

Commit 2bce04f7 authored by Colin Cross's avatar Colin Cross Committed by Gerrit Code Review
Browse files

Merge "Add linux_musl arm+arm64"

parents 943cfcec a9b2aacf

android/arch.go

+1 −1
Original line number Diff line number Diff line
@@ -307,7 +307,7 @@ var ( 
	// Linux is the OS for the Linux kernel plus the glibc runtime.

	Linux = newOsType("linux_glibc", Host, false, X86, X86_64)

	// LinuxMusl is the OS for the Linux kernel plus the musl runtime.

	LinuxMusl = newOsType("linux_musl", Host, false, X86, X86_64)

	LinuxMusl = newOsType("linux_musl", Host, false, X86, X86_64, Arm64, Arm)

	// Darwin is the OS for MacOS/Darwin host machines.

	Darwin = newOsType("darwin", Host, false, Arm64, X86_64)

	// LinuxBionic is the OS for the Linux kernel plus the Bionic libc runtime, but without the

android/paths.go

+7 −1
Original line number Diff line number Diff line
@@ -1739,10 +1739,16 @@ func pathForInstall(ctx PathContext, os OsType, arch ArchType, partition string, 
		partionPaths = []string{"target", "product", ctx.Config().DeviceName(), partition}

	} else {

		osName := os.String()

		if os == Linux || os == LinuxMusl {

		if os == Linux {

			// instead of linux_glibc

			osName = "linux"

		}

		if os == LinuxMusl && ctx.Config().UseHostMusl() {

			// When using musl instead of glibc, use "linux" instead of "linux_musl".  When cross

			// compiling we will still use "linux_musl".

			osName = "linux"

		}



		// SOONG_HOST_OUT is set to out/host/$(HOST_OS)-$(HOST_PREBUILT_ARCH)

		// and HOST_PREBUILT_ARCH is forcibly set to x86 even on x86_64 hosts. We don't seem

		// to have a plan to fix it (see the comment in build/make/core/envsetup.mk).

bazel/configurability.go

+4 −0
Original line number Diff line number Diff line
@@ -43,6 +43,8 @@ const ( 
	osArchDarwinX86_64      = "darwin_x86_64"

	osArchLinuxX86          = "linux_glibc_x86"

	osArchLinuxX86_64       = "linux_glibc_x86_64"

	osArchLinuxMuslArm      = "linux_musl_arm"

	osArchLinuxMuslArm64    = "linux_musl_arm64"

	osArchLinuxMuslX86      = "linux_musl_x86"

	osArchLinuxMuslX86_64   = "linux_musl_x86_64"

	osArchLinuxBionicArm64  = "linux_bionic_arm64"
@@ -101,6 +103,8 @@ var ( 
		osArchDarwinX86_64:         "//build/bazel/platforms/os_arch:darwin_x86_64",

		osArchLinuxX86:             "//build/bazel/platforms/os_arch:linux_glibc_x86",

		osArchLinuxX86_64:          "//build/bazel/platforms/os_arch:linux_glibc_x86_64",

		osArchLinuxMuslArm:         "//build/bazel/platforms/os_arch:linux_musl_arm",

		osArchLinuxMuslArm64:       "//build/bazel/platforms/os_arch:linux_musl_arm64",

		osArchLinuxMuslX86:         "//build/bazel/platforms/os_arch:linux_musl_x86",

		osArchLinuxMuslX86_64:      "//build/bazel/platforms/os_arch:linux_musl_x86_64",

		osArchLinuxBionicArm64:     "//build/bazel/platforms/os_arch:linux_bionic_arm64",

bp2build/cc_object_conversion_test.go

+1 −0
Original line number Diff line number Diff line
@@ -414,6 +414,7 @@ func TestCcObjectSelectOnLinuxAndBionicArchs(t *testing.T) { 
            "bionic_arm64.cpp",

        ],

        "//build/bazel/platforms/os_arch:linux_glibc_x86": ["linux_x86.cpp"],

        "//build/bazel/platforms/os_arch:linux_musl_arm64": ["linux_arm64.cpp"],

        "//build/bazel/platforms/os_arch:linux_musl_x86": ["linux_x86.cpp"],

        "//conditions:default": [],

    })`,

cc/config/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ bootstrap_go_package { 
        "x86_device.go",

        "x86_64_device.go",



        "arm_linux_host.go",

        "darwin_host.go",

        "x86_linux_host.go",

        "x86_linux_bionic_host.go",