Merge "Move coverage builds prebuilt special case to make" into main am: 40cc23b709
Original change: https://android-review.googlesource.com/c/platform/build/+/3065665 Change-Id: If86509e853f34205d5a12714215f76b1941bc293 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -314,6 +314,14 @@ endif
|
|||||||
ifeq (true,$(PRODUCT_MODULE_BUILD_FROM_SOURCE))
|
ifeq (true,$(PRODUCT_MODULE_BUILD_FROM_SOURCE))
|
||||||
ignore_apex_contributions := true
|
ignore_apex_contributions := true
|
||||||
endif
|
endif
|
||||||
|
ifneq ($(EMMA_INSTRUMENT)$(EMMA_INSTRUMENT_STATIC)$(EMMA_INSTRUMENT_FRAMEWORK)$(CLANG_COVERAGE)$(NATIVE_COVERAGE_PATHS),)
|
||||||
|
# Coverage builds for TARGET_RELEASE=foo should always build from source,
|
||||||
|
# even if TARGET_RELEASE=foo uses prebuilt mainline modules.
|
||||||
|
# This is necessary because the checked-in prebuilts were generated with
|
||||||
|
# instrumentation turned off.
|
||||||
|
ignore_apex_contributions := true
|
||||||
|
endif
|
||||||
|
|
||||||
ifeq (true, $(ignore_apex_contributions))
|
ifeq (true, $(ignore_apex_contributions))
|
||||||
PRODUCT_BUILD_IGNORE_APEX_CONTRIBUTION_CONTENTS := true
|
PRODUCT_BUILD_IGNORE_APEX_CONTRIBUTION_CONTENTS := true
|
||||||
endif
|
endif
|
||||||
|
Reference in New Issue
Block a user