Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bd31f173 authored by Joe Onorato's avatar Joe Onorato Committed by Android Git Automerger
Browse files

am f9f6084a: Respect LOCAL_ADDITIONAL_DEPENDENCIES for host java libraries. 

* commit 'f9f6084a':
  Respect LOCAL_ADDITIONAL_DEPENDENCIES for host java libraries.
parents d2637573 f9f6084a

core/host_java_library.mk

+4 −2
Original line number Diff line number Diff line
@@ -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