diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-22 17:53:12 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-22 17:53:12 +0000 |
| commit | a0fba540d196a4d5a1ef1703484804a5ceb09b02 (patch) | |
| tree | 43dd6ef4ab8e9c16c84300c37ad1ccdb96cbb1b7 | |
| parent | 446a1b683a6d017abb5345f391782b6d8eec913f (diff) | |
| parent | 96a5be9a1df3ada52134d6041004e5eda9c2e6d5 (diff) | |
| download | build-a0fba540d196a4d5a1ef1703484804a5ceb09b02.tar.gz | |
Snap for 8627648 from 96a5be9a1df3ada52134d6041004e5eda9c2e6d5 to tm-frc-media-swcodec-release
Change-Id: Id1fa96080c8e03fea39ff2b8b92094673480bb12
| -rw-r--r-- | core/android_soong_config_vars.mk | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk index 329847fbbd..144edd088e 100644 --- a/core/android_soong_config_vars.mk +++ b/core/android_soong_config_vars.mk @@ -39,7 +39,14 @@ $(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. -BRANCH_DEFAULT_MODULE_BUILD_FROM_SOURCE := true +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. |