diff options
| author | Yohann Roussel <yroussel@google.com> | 2015-06-02 09:36:27 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-02 09:36:27 +0000 |
| commit | a9dd74c39515759599a3b01f7772de9f19325800 (patch) | |
| tree | 7ed01e8d474ed4fc271f8ca2deb4d93ede2cc3d9 /core/java.mk | |
| parent | d760d4676bb50ce74e4cc9a2813c592c189d31c9 (diff) | |
| parent | 5b2c6e26dbda66a2245f987db0428c2bf2eb7c95 (diff) | |
| download | build-a9dd74c39515759599a3b01f7772de9f19325800.zip build-a9dd74c39515759599a3b01f7772de9f19325800.tar.gz build-a9dd74c39515759599a3b01f7772de9f19325800.tar.bz2 | |
Merge "Add support for RMTYPEDEF with Jack" into mnc-dev
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 66993e7..ae4a602 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) \ |