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

Commit 560fddac authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

Merge "Drop HOST_CROSS_ARCH special-case in source vs prebuilt mainline selection" into main am: f45c1900 am: b568ddb0

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



Change-Id: Iab7bb9b9198927a7475b52f737af06d59345fac8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3c838147 b568ddb0

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 host side arm64 variants needed for products that

# set HOST_CROSS_ARCH=arm64.

ifeq (arm64,${HOST_CROSS_ARCH})

  BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE := true

endif



ifneq (,$(MODULE_BUILD_FROM_SOURCE))

  # Keep an explicit setting.

else ifeq (,$(filter docs sdk win_sdk sdk_addon,$(MAKECMDGOALS))$(findstring com.google.android.conscrypt,$(PRODUCT_PACKAGES))$(findstring com.google.android.go.conscrypt,$(PRODUCT_PACKAGES)))