commit 6dcda02e4c51fc882742debdc70f03b360c7dc86
author Colin Cross <ccross@android.com> Mon Sep 28 19:25:15 2015 -0700
committer Colin Cross <ccross@android.com> Mon Sep 28 19:25:15 2015 -0700
tree a14b6df2e5e62be98754b7dbfbe732b58123226b
parent 00b3248839205674b692a7464bd6df5777b81e83
parent 5acaa9dca07141f8123858fc76ce850b4dbbc813

resolved conflicts for 5acaa9dc to master

Change-Id: Idbadd1127e9524b6ecb571cdc7338d106ca2be3f

core/java.mk

diff --git a/core/java.mk b/core/java.mk
index 51b42f7..2cf42cb 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -304,7 +304,7 @@
 
 $(aidl_java_sources): $(intermediates.COMMON)/src/%.java: \
         $(LOCAL_PATH)/%.aidl \
-        $(LOCAL_MODULE_MAKEFILE) \
+        $(LOCAL_MODULE_MAKEFILE_DEP) \
         $(LOCAL_ADDITIONAL_DEPENDENCIES) \
         $(AIDL) \
         $(aidl_preprocess_import)
@@ -412,7 +412,7 @@
         $(layers_file) \
         $(RenderScript_file_stamp) \
         $(proto_java_sources_file_stamp) \
-        $(LOCAL_MODULE_MAKEFILE) \
+        $(LOCAL_MODULE_MAKEFILE_DEP) \
         $(LOCAL_ADDITIONAL_DEPENDENCIES)
 	$(transform-java-to-classes.jar)
 
@@ -648,7 +648,7 @@
 jack_all_deps := $(java_sources) $(java_resource_sources) $(full_jack_lib_deps) \
         $(jar_manifest_file) $(layers_file) $(RenderScript_file_stamp) $(proguard_flag_files) \
         $(proto_java_sources_file_stamp) $(LOCAL_ADDITIONAL_DEPENDENCIES) $(LOCAL_JARJAR_RULES) \
-        $(LOCAL_MODULE_MAKEFILE) $(JACK)
+        $(LOCAL_MODULE_MAKEFILE_DEP) $(JACK)
 
 ifeq ($(LOCAL_IS_STATIC_JAVA_LIBRARY),true)
 $(full_classes_jack): $(jack_all_deps)