diff options
| author | Colin Cross <ccross@android.com> | 2015-09-28 19:25:15 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2015-09-28 19:25:15 -0700 |
| commit | 6dcda02e4c51fc882742debdc70f03b360c7dc86 (patch) | |
| tree | a14b6df2e5e62be98754b7dbfbe732b58123226b /core/java.mk | |
| parent | 00b3248839205674b692a7464bd6df5777b81e83 (diff) | |
| parent | 5acaa9dca07141f8123858fc76ce850b4dbbc813 (diff) | |
| download | platform_build-6dcda02e4c51fc882742debdc70f03b360c7dc86.tar.gz platform_build-6dcda02e4c51fc882742debdc70f03b360c7dc86.tar.bz2 platform_build-6dcda02e4c51fc882742debdc70f03b360c7dc86.zip | |
resolved conflicts for 5acaa9dc to master
Change-Id: Idbadd1127e9524b6ecb571cdc7338d106ca2be3f
Diffstat (limited to 'core/java.mk')
| -rw-r--r-- | core/java.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java.mk b/core/java.mk index 51b42f7ac9..2cf42cb800 100644 --- a/core/java.mk +++ b/core/java.mk @@ -304,7 +304,7 @@ $(aidl_java_sources): PRIVATE_AIDL_FLAGS := -b $(addprefix -p,$(aidl_preprocess_ $(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 @@ $(full_classes_compiled_jar): \ $(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 @@ $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JACK_FLAGS := $(GLOBAL_JAVAC_DEBUG_FLAGS) 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) |