commit f52543b2e1fb70ea5c66a894f8e8714db52d6596
author Spandan Das <spandandas@google.com> Tue Apr 09 16:47:33 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Apr 09 16:47:33 2024 +0000
tree 0fd7be87c86e6bc1aa980afcb8de7ad89be0adf2
parent cf7f5375be2fcda77c192a23ad84afeb9a7ce99c
parent 1b5883390691e66affc61cf9c5ba4dae583fcb46

Merge "Drop HOST_CROSS_OS special-case in source vs prebuilt mainline selection" into main

core/android_soong_config_vars.mk

diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk
index 29fb7aa..cf75366 100644
--- a/core/android_soong_config_vars.mk
+++ b/core/android_soong_config_vars.mk
@@ -44,12 +44,6 @@
   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})