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

Commit 1826621b authored Sep 23, 2021 by Chris Parsons

Disable mixed builds for non-device OS

We don't currently support propagation of OS in mixed builds, and our
host toolchains are not properly configured.

This allows us to continue to make progress on device OS until host is
supported.

Test: mixed_libc CI
Test: USE_BAZEL_ANALYSI=1 m adbd
Change-Id: I2bf8b3f9ca7928dd33bf2fb3d4fa067da0f593f3

parent a06db33e

android/bazel.go

+0 −5

Original line number	Diff line number	Diff line
		@@ -272,11 +272,6 @@ var (
		// still be generated via bp2build.
		mixedBuildsDisabledList = []string{
		"libbrotli", // http://b/198585397, ld.lld: error: bionic/libc/arch-arm64/generic/bionic/memmove.S:95:(.text+0x10): relocation R_AARCH64_CONDBR19 out of range: -1404176 is not in [-1048576, 1048575]; references __memcpy
		"libc++fs", // http://b/198403271, Missing symbols/members in the global namespace when referenced from headers in //external/libcxx/includes
		"libc++_experimental", // http://b/198403271, Missing symbols/members in the global namespace when referenced from headers in //external/libcxx/includes
		"libc++_static", // http://b/198403271, Missing symbols/members in the global namespace when referenced from headers in //external/libcxx/includes
		"libc++abi", // http://b/195970501, cc_library_static, duplicate symbols because it propagates libc objects.
		"libc++demangle", // http://b/195970501, cc_library_static, duplicate symbols because it propagates libc objects.
		"func_to_syscall_nrs", // http://b/200899432, bazel-built cc_genrule does not work in mixed build when it is a dependency of another soong module.
		"libseccomp_policy_app_zygote_sources", // http://b/200899432, bazel-built cc_genrule does not work in mixed build when it is a dependency of another soong module.
		"libseccomp_policy_app_sources", // http://b/200899432, bazel-built cc_genrule does not work in mixed build when it is a dependency of another soong module.

cc/cc.go

+3 −1

Original line number	Diff line number	Diff line
		@@ -1711,7 +1711,9 @@ func (c *Module) setSubnameProperty(actx android.ModuleContext) {
		func (c *Module) maybeGenerateBazelActions(actx android.ModuleContext) bool {
		bazelModuleLabel := c.GetBazelLabel(actx, c)
		bazelActionsUsed := false
		if c.MixedBuildsEnabled(actx) && c.bazelHandler != nil {
		// Mixed builds mode is disabled for modules outside of device OS.
		// TODO(b/200841190): Support non-device OS in mixed builds.
		if c.MixedBuildsEnabled(actx) && c.bazelHandler != nil && actx.Os().Class == android.Device {
		bazelActionsUsed = c.bazelHandler.GenerateBazelBuildActions(actx, bazelModuleLabel)
		}
		return bazelActionsUsed