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/java.mk

diff --git a/core/java.mk b/core/java.mk
index 944a685..4885d74 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -328,6 +328,7 @@
 	PRIVATE_CLASS_INTERMEDIATES_DIR := $(intermediates.COMMON)/classes
 $(LOCAL_INTERMEDIATE_TARGETS): \
 	PRIVATE_SOURCE_INTERMEDIATES_DIR := $(LOCAL_INTERMEDIATE_SOURCE_DIR)
+$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_RMTYPEDEFS := $(LOCAL_RMTYPEDEFS)
 
 # Since we're using intermediates.COMMON, make sure that it gets cleaned
 # properly.
@@ -367,7 +368,6 @@
 $(full_classes_compiled_jar): PRIVATE_JAR_EXCLUDE_FILES := $(LOCAL_JAR_EXCLUDE_FILES)
 $(full_classes_compiled_jar): PRIVATE_JAR_PACKAGES := $(LOCAL_JAR_PACKAGES)
 $(full_classes_compiled_jar): PRIVATE_JAR_EXCLUDE_PACKAGES := $(LOCAL_JAR_EXCLUDE_PACKAGES)
-$(full_classes_compiled_jar): PRIVATE_RMTYPEDEFS := $(LOCAL_RMTYPEDEFS)
 $(full_classes_compiled_jar): PRIVATE_DONT_DELETE_JAR_META_INF := $(LOCAL_DONT_DELETE_JAR_META_INF)
 $(full_classes_compiled_jar): \
         $(java_sources) \