Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 08e38833 authored by Ying Wang's avatar Ying Wang Committed by Android (Google) Code Review
Browse files

Merge "Let Proguard load emma jar if it's enabled."

parents 4f85d001 389b7e11

core/java.mk

+7 −3
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ LOCAL_INTERMEDIATE_TARGETS += \ 
    $(full_classes_jar) \

    $(full_classes_compiled_jar) \

    $(full_classes_emma_jar) \

    $(full_classes_full_names_jar) \

    $(full_classes_stubs_jar) \

    $(full_classes_jarjar_jar) \

    $(built_dex)
@@ -177,9 +178,12 @@ $(full_classes_emma_jar): PRIVATE_EMMA_COVERAGE_FILE := $(intermediates.COMMON)/ 
$(full_classes_emma_jar): PRIVATE_EMMA_INTERMEDIATES_DIR := $(emma_intermediates_dir)

# this rule will generate both $(PRIVATE_EMMA_COVERAGE_FILE) and

# $(full_classes_emma_jar)

$(full_classes_emma_jar): $(full_classes_compiled_jar)

$(full_classes_emma_jar): $(full_classes_compiled_jar) | $(EMMA_JAR)

	$(transform-classes.jar-to-emma)

$(PRIVATE_EMMA_COVERAGE_FILE): $(full_classes_emma_jar)



# tell proguard to load emma jar

LOCAL_PROGUARD_FLAGS := $(LOCAL_PROGUARD_FLAGS) $(addprefix -libraryjars ,$(EMMA_JAR))

else

$(full_classes_emma_jar): $(full_classes_compiled_jar) | $(ACP)

	@echo Copying: $<