diff options
| author | Dan Albert <danalbert@google.com> | 2014-11-11 23:00:40 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-11 23:00:40 +0000 |
| commit | 6da20991fd8854e10e1a4d294187dc80d28f2b19 (patch) | |
| tree | 83ae7752d4fc1dd5f42c7a1f70d7978cce838f95 /core/java.mk | |
| parent | 655f7c9a82374adfbf9419902a9627f90dc5e651 (diff) | |
| parent | 5245bc8b3421b3a9676a9ad650d0804d8d9e2787 (diff) | |
| download | build-6da20991fd8854e10e1a4d294187dc80d28f2b19.zip build-6da20991fd8854e10e1a4d294187dc80d28f2b19.tar.gz build-6da20991fd8854e10e1a4d294187dc80d28f2b19.tar.bz2 | |
am 5245bc8b: am 201f6b3e: Merge "Make modules depend on their makefile."
* commit '5245bc8b3421b3a9676a9ad650d0804d8d9e2787':
Make modules depend on their makefile.
Diffstat (limited to 'core/java.mk')
| -rw-r--r-- | core/java.mk | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/core/java.mk b/core/java.mk index 4d17477..9882ee2 100644 --- a/core/java.mk +++ b/core/java.mk @@ -354,9 +354,16 @@ $(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) $(java_resource_sources) $(full_java_lib_deps) \ - $(jar_manifest_file) $(layers_file) $(RenderScript_file_stamp) \ - $(proto_java_sources_file_stamp) $(LOCAL_ADDITIONAL_DEPENDENCIES) +$(full_classes_compiled_jar): \ + $(java_sources) \ + $(java_resource_sources) \ + $(full_java_lib_deps) \ + $(jar_manifest_file) \ + $(layers_file) \ + $(RenderScript_file_stamp) \ + $(proto_java_sources_file_stamp) \ + $(LOCAL_MODULE_MAKEFILE) \ + $(LOCAL_ADDITIONAL_DEPENDENCIES) $(transform-java-to-classes.jar) $(full_classes_compiled_jar): PRIVATE_JAVAC_DEBUG_FLAGS := -g |