diff options
| author | Paul Duffin <paulduffin@google.com> | 2022-05-23 14:49:47 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2022-05-23 14:49:47 +0000 |
| commit | 525d7a8a143c0cd5c800fcf7cd74e8758ffd4ad3 (patch) | |
| tree | d3cec22ce8ac463f7c4ae0088070f491ff6ab5ee | |
| parent | 96a5be9a1df3ada52134d6041004e5eda9c2e6d5 (diff) | |
| parent | dddc036bd1d6c3fb8a403dbdd20ac062af574000 (diff) | |
| download | build-525d7a8a143c0cd5c800fcf7cd74e8758ffd4ad3.tar.gz | |
Merge "Revert "Enable mainline prebuilts on tm-dev branch."" into tm-dev
| -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. |