DO NOT MERGE Skip emma instrumentation if we're using jack. (ca96e25c) · Commits · e / os / android_build

core/java.mk

+5 −6

Original line number	Original line	Diff line number	Diff line
	@@ -459,6 +459,8 @@ $(full_classes_jarjar_jar): $(full_classes_compiled_jar) \| $(ACP)
	$(hide) $(ACP) -fp $< $@		$(hide) $(ACP) -fp $< $@
	endif		endif

			full_classes_jar_source := $(full_classes_jarjar_jar)
			ifndef LOCAL_JACK_ENABLED
	ifeq ($(LOCAL_EMMA_INSTRUMENT),true)		ifeq ($(LOCAL_EMMA_INSTRUMENT),true)
	$(full_classes_emma_jar): PRIVATE_EMMA_COVERAGE_FILE := $(intermediates.COMMON)/coverage.emma.ignore		$(full_classes_emma_jar): PRIVATE_EMMA_COVERAGE_FILE := $(intermediates.COMMON)/coverage.emma.ignore
	$(full_classes_emma_jar): PRIVATE_EMMA_INTERMEDIATES_DIR := $(emma_intermediates_dir)		$(full_classes_emma_jar): PRIVATE_EMMA_INTERMEDIATES_DIR := $(emma_intermediates_dir)
	@@ -475,15 +477,12 @@ endif
	# $(full_classes_emma_jar)		# $(full_classes_emma_jar)
	$(full_classes_emma_jar): $(full_classes_jarjar_jar) \| $(EMMA_JAR)		$(full_classes_emma_jar): $(full_classes_jarjar_jar) \| $(EMMA_JAR)
	$(transform-classes.jar-to-emma)		$(transform-classes.jar-to-emma)
			full_classes_jar_source := $(full_classes_emma_jar)
	else		endif
	$(full_classes_emma_jar): $(full_classes_jarjar_jar) \| $(ACP)
	@echo Copying: $@
	$(copy-file-to-target)
	endif		endif

	# Keep a copy of the jar just before proguard processing.		# Keep a copy of the jar just before proguard processing.
	$(full_classes_jar): $(full_classes_emma_jar) \| $(ACP)		$(full_classes_jar): $(full_classes_jar_source) \| $(ACP)
	@echo Copying: $@		@echo Copying: $@
	$(hide) $(ACP) -fp $< $@		$(hide) $(ACP) -fp $< $@