summaryrefslogtreecommitdiffstats
path: root/core/java.mk
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2014-11-08 22:20:03 -0800
committerDan Albert <danalbert@google.com>2014-11-11 14:30:54 -0800
commit954b5bdcf4c3621c10666a09bbfc3fe1cf785950 (patch)
treeef93620abe82f1d26b98d15d5588426cc2debfa6 /core/java.mk
parent1f6371583ef6ce3a384262ebb291515f5ca3a7b6 (diff)
downloadbuild-954b5bdcf4c3621c10666a09bbfc3fe1cf785950.zip
build-954b5bdcf4c3621c10666a09bbfc3fe1cf785950.tar.gz
build-954b5bdcf4c3621c10666a09bbfc3fe1cf785950.tar.bz2
Make modules depend on their makefile.
This should obviate much of the need for cleanspecs, and also make it unnecessary to continue adding LOCAL_ADDITIONAL_DEPENDENCIES for this sort of thing all over the tree. Change-Id: I97aa8fd280ae868a5f6364f8b7bf3c2fe235d6ce
Diffstat (limited to 'core/java.mk')
-rw-r--r--core/java.mk13
1 files changed, 10 insertions, 3 deletions
diff --git a/core/java.mk b/core/java.mk
index 49375a6..98d5138 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -349,9 +349,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