diff options
| author | Paul Duffin <paulduffin@google.com> | 2022-05-21 00:12:03 +0000 |
|---|---|---|
| committer | Paul Duffin <paulduffin@google.com> | 2022-05-21 00:17:09 +0000 |
| commit | dddc036bd1d6c3fb8a403dbdd20ac062af574000 (patch) | |
| tree | d3cec22ce8ac463f7c4ae0088070f491ff6ab5ee | |
| parent | de9f0b12f1b1f9f57358caf5d63af2e3124fe1b7 (diff) | |
| download | build-dddc036bd1d6c3fb8a403dbdd20ac062af574000.tar.gz | |
Revert "Enable mainline prebuilts on tm-dev branch."
This reverts commit de9f0b12f1b1f9f57358caf5d63af2e3124fe1b7.
Reason for revert: breaks build_test and build_test2 on git_tm-dev.
Reverting the topic together does not work due to limitations with TH. However, this is the change that caused the error, the other changes were just fixing issues unrelated to this specific problem.
Bug: 233412962
Bug: 230478310
Bug: 223592962
Change-Id: I4d4de4f4c63c9c34fb083edbe76b09852af357e4
Test: presubmit
| -rw-r--r-- | core/android_soong_config_vars.mk | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk index 144edd088e..329847fbbd 100644 --- a/core/android_soong_config_vars.mk +++ b/core/android_soong_config_vars.mk @@ -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 +BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE := true ifneq (,$(MODULE_BUILD_FROM_SOURCE)) # Keep an explicit setting. |