diff options
| author | Yohann Roussel <yroussel@google.com> | 2015-05-20 17:52:15 +0200 |
|---|---|---|
| committer | Yohann Roussel <yroussel@google.com> | 2015-05-28 18:10:03 +0200 |
| commit | 5b2c6e26dbda66a2245f987db0428c2bf2eb7c95 (patch) | |
| tree | 2a1ba88379c1c9baae0a7f7a4d2ace176c9e0c8d /core/java.mk | |
| parent | 09ee0a4252dbfd811f8345ab095c95ab78a1595f (diff) | |
| download | build-5b2c6e26dbda66a2245f987db0428c2bf2eb7c95.zip build-5b2c6e26dbda66a2245f987db0428c2bf2eb7c95.tar.gz build-5b2c6e26dbda66a2245f987db0428c2bf2eb7c95.tar.bz2 | |
Add support for RMTYPEDEF with Jack
Bug: 21099584
Change-Id: I39aa1f24780c216e978ef743098ca7ac65b2962e
Diffstat (limited to 'core/java.mk')
| -rw-r--r-- | core/java.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java.mk b/core/java.mk index 73b8780..5c0933e 100644 --- a/core/java.mk +++ b/core/java.mk @@ -330,6 +330,7 @@ $(LOCAL_INTERMEDIATE_TARGETS): \ 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. @@ -369,7 +370,6 @@ $(full_classes_compiled_jar): PRIVATE_JAVACFLAGS := $(LOCAL_JAVACFLAGS) $(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) \ |