commit b518c3ec0bcd2d874be19fa4717262ad771fcc9c
author Yohann Roussel <yroussel@google.com> Wed May 20 17:52:15 2015 +0200
committer Yohann Roussel <yroussel@google.com> Tue Jun 02 12:25:51 2015 +0200
tree 28db119de11d2c43261d6d2c7ef0bcf06c488379
parent b7bb040c75922795b47434e09cd09842ad11fd46

[DO NOT MERGE] Add support for RMTYPEDEF with Jack

Bug: 21099584

(cherry-picked from commit 5b2c6e26dbda66a2245f987db0428c2bf2eb7c95)

Change-Id: I39aa1f24780c216e978ef743098ca7ac65b2962e

core/host_java_library.mk

diff --git a/core/host_java_library.mk b/core/host_java_library.mk
index 513d185..47189d7 100644
--- a/core/host_java_library.mk
+++ b/core/host_java_library.mk
@@ -43,6 +43,8 @@
 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)
@@ -78,7 +80,6 @@
 $(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) \