From f9f6084aab34daf4ea7ddb697d84a8b147523763 Mon Sep 17 00:00:00 2001 From: Joe Onorato Date: Tue, 9 Oct 2012 19:39:43 -0700 Subject: [PATCH] Respect LOCAL_ADDITIONAL_DEPENDENCIES for host java libraries. (makes generating code easier) Change-Id: I1e2e882f7805dbfe4b726955eddc5ff8bc3e0005 --- core/host_java_library.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core/host_java_library.mk b/core/host_java_library.mk index 5930da62b..b14bd9e78 100644 --- a/core/host_java_library.mk +++ b/core/host_java_library.mk @@ -53,7 +53,8 @@ $(cleantarget): PRIVATE_CLEAN_FILES += $(intermediates.COMMON) $(full_classes_compiled_jar): PRIVATE_JAVACFLAGS := $(LOCAL_JAVACFLAGS) $(full_classes_compiled_jar): PRIVATE_JAR_EXCLUDE_FILES := -$(full_classes_compiled_jar): $(java_sources) $(java_resource_sources) $(full_java_lib_deps) $(jar_manifest_file) +$(full_classes_compiled_jar): $(java_sources) $(java_resource_sources) $(full_java_lib_deps) \ + $(jar_manifest_file) $(LOCAL_ADDITIONAL_DEPENDENCIES) $(transform-host-java-to-package) # Run jarjar if necessary, otherwise just copy the file. @@ -90,6 +91,7 @@ endif else $(LOCAL_BUILT_MODULE): PRIVATE_JAVACFLAGS := $(LOCAL_JAVACFLAGS) $(LOCAL_BUILT_MODULE): PRIVATE_JAR_EXCLUDE_FILES := -$(LOCAL_BUILT_MODULE): $(java_sources) $(java_resource_sources) $(full_java_lib_deps) $(jar_manifest_file) +$(LOCAL_BUILT_MODULE): $(java_sources) $(java_resource_sources) $(full_java_lib_deps) \ + $(jar_manifest_file) $(LOCAL_ADDITIONAL_DEPENDENCIES) $(transform-host-java-to-package) endif # LOCAL_BUILD_HOST_DEX -- 2.11.0