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

Commit db22a997 authored by Paul Duffin's avatar Paul Duffin Committed by Automerger Merge Worker
Browse files

Merge "Revert "Enable mainline prebuilts on tm-dev branch."" into tm-dev am:... 

Merge "Revert "Enable mainline prebuilts on tm-dev branch."" into tm-dev am: 525d7a8a am: d873f7a1

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



Change-Id: I5326820364388c4d9780b83165d4c462b864750b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f244566d d873f7a1

core/android_soong_config_vars.mk

+1 −8
Original line number Diff line number Diff line
@@ -39,14 +39,7 @@ $(call add_soong_config_var,ANDROID,PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT) 
# Default behavior for the tree wrt building modules or using prebuilts. This

# can always be overridden by setting the environment variable

# MODULE_BUILD_FROM_SOURCE.

ifneq ($(SANITIZE_TARGET)$(EMMA_INSTRUMENT_FRAMEWORK),)

  # Always use sources when building the framework with Java coverage or

  # sanitized builds as they both require purpose built prebuilts which we do

  # not provide.

BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE := true

else

  BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE := false

endif



ifneq (,$(MODULE_BUILD_FROM_SOURCE))

  # Keep an explicit setting.