Commit b2d5b1ae authored Apr 09, 2024 by Spandan Das Committed by Automerger Merge Worker Apr 09, 2024

Merge "Drop HOST_CROSS_OS special-case in source vs prebuilt mainline...

Merge "Drop HOST_CROSS_OS special-case in source vs prebuilt mainline selection" into main am: f52543b2 am: 90ce5979

Original change: https://android-review.googlesource.com/c/platform/build/+/3032150

Change-Id: I2fe280f57bef9d368525b6625141907f99e5fe60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

core/android_soong_config_vars.mk

+0 −6

Original line number	Diff line number	Diff line
		@@ -44,12 +44,6 @@ ifeq (,$(BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE))
		BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE := false
		endif

		# ART does not provide linux_bionic variants needed for products that
		# set HOST_CROSS_OS=linux_bionic.
		ifeq (linux_bionic,${HOST_CROSS_OS})
		BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE := true
		endif

		# ART does not provide host side arm64 variants needed for products that
		# set HOST_CROSS_ARCH=arm64.
		ifeq (arm64,${HOST_CROSS_ARCH})