diff options
| author | Joe Onorato <joeo@google.com> | 2012-10-12 11:02:53 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-12 11:02:53 -0700 |
| commit | bd31f1733370e7b260078b67c5e3a88ec7c50b11 (patch) | |
| tree | 1fec13cf4407ba8f052e3f2a69ebd5dddb5ebfc6 | |
| parent | d26375733992298edc036652d25170e1cd7cbd49 (diff) | |
| parent | f9f6084aab34daf4ea7ddb697d84a8b147523763 (diff) | |
| download | build-bd31f1733370e7b260078b67c5e3a88ec7c50b11.zip build-bd31f1733370e7b260078b67c5e3a88ec7c50b11.tar.gz build-bd31f1733370e7b260078b67c5e3a88ec7c50b11.tar.bz2 | |
am f9f6084a: Respect LOCAL_ADDITIONAL_DEPENDENCIES for host java libraries.
* commit 'f9f6084aab34daf4ea7ddb697d84a8b147523763':
Respect LOCAL_ADDITIONAL_DEPENDENCIES for host java libraries.
| -rw-r--r-- | core/host_java_library.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/core/host_java_library.mk b/core/host_java_library.mk index 5930da6..b14bd9e 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 |