diff options
Diffstat (limited to 'core/host_java_library.mk')
| -rw-r--r-- | core/host_java_library.mk | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/core/host_java_library.mk b/core/host_java_library.mk index b751c5f..47189d7 100644 --- a/core/host_java_library.mk +++ b/core/host_java_library.mk @@ -43,6 +43,8 @@ LOCAL_INTERMEDIATE_TARGETS += \ include $(BUILD_SYSTEM)/base_rules.mk ####################################### +$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_RMTYPEDEFS := + ifeq (true,$(LOCAL_EMMA_INSTRUMENT)) $(full_classes_emma_jar): PRIVATE_EMMA_COVERAGE_FILE := $(intermediates.COMMON)/coverage.em $(full_classes_emma_jar): PRIVATE_EMMA_INTERMEDIATES_DIR := $(emma_intermediates_dir) @@ -58,13 +60,13 @@ endif $(full_classes_emma_jar) : $(full_classes_compiled_jar) | $(EMMA_JAR) $(transform-classes.jar-to-emma) -$(LOCAL_BUILT_MODULE) : $(full_classes_emma_jar) +$(built_javalib_jar) : $(full_classes_emma_jar) @echo Copying: $@ $(hide) $(ACP) -fp $< $@ else # LOCAL_EMMA_INSTRUMENT -# Directly build into LOCAL_BUILT_MODULE. -full_classes_compiled_jar := $(LOCAL_BUILT_MODULE) +# Directly build into $(built_javalib_jar). +full_classes_compiled_jar := $(built_javalib_jar) endif # LOCAL_EMMA_INSTRUMENT $(full_classes_compiled_jar): PRIVATE_JAVAC_DEBUG_FLAGS := -g @@ -78,7 +80,6 @@ $(full_classes_compiled_jar): PRIVATE_JAVACFLAGS := $(LOCAL_JAVACFLAGS) $(full_classes_compiled_jar): PRIVATE_JAR_EXCLUDE_FILES := $(full_classes_compiled_jar): PRIVATE_JAR_PACKAGES := $(full_classes_compiled_jar): PRIVATE_JAR_EXCLUDE_PACKAGES := -$(full_classes_compiled_jar): PRIVATE_RMTYPEDEFS := $(full_classes_compiled_jar): \ $(java_sources) \ $(java_resource_sources) \ |