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

Commit c06243d1 authored Apr 26, 2010 by Ying Wang

Fix jar dependency on the local manifest file.

Change-Id: I1a868885e72c94c4b065723a8d6e890fce5ba1e0
http://b/issue?id=1444634

parent ec5e729f

core/base_rules.mk

+3 −1

Original line number	Diff line number	Diff line
		@@ -384,8 +384,10 @@ ifdef LOCAL_INSTRUMENTATION_FOR
		full_java_lib_deps += $(link_instr_intermediates_dir.COMMON)/classes-full-names.jar
		endif

		jar_manifest_file :=
		ifneq ($(strip $(LOCAL_JAR_MANIFEST)),)
		$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JAR_MANIFEST := $(LOCAL_PATH)/$(LOCAL_JAR_MANIFEST)
		jar_manifest_file := $(LOCAL_PATH)/$(LOCAL_JAR_MANIFEST)
		$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JAR_MANIFEST := $(jar_manifest_file)
		else
		$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JAR_MANIFEST :=
		endif

core/host_java_library.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -26,5 +26,5 @@ LOCAL_BUILT_MODULE_STEM := javalib.jar
		include $(BUILD_SYSTEM)/base_rules.mk

		$(LOCAL_BUILT_MODULE): PRIVATE_JAVACFLAGS := $(LOCAL_JAVACFLAGS)
		$(LOCAL_BUILT_MODULE): $(java_sources) $(java_resource_sources) $(full_java_lib_deps)
		$(LOCAL_BUILT_MODULE): $(java_sources) $(java_resource_sources) $(full_java_lib_deps) $(jar_manifest_file)
		$(transform-host-java-to-package)

core/java.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -172,7 +172,7 @@ ALL_MODULES.$(LOCAL_MODULE).STUBS := $(full_classes_stubs_jar)
		# Deps for generated source files must be handled separately,
		# via deps on the target that generates the sources.
		$(full_classes_compiled_jar): PRIVATE_JAVACFLAGS := $(LOCAL_JAVACFLAGS)
		$(full_classes_compiled_jar): $(java_sources) $(full_java_lib_deps)
		$(full_classes_compiled_jar): $(java_sources) $(full_java_lib_deps) $(jar_manifest_file)
		$(transform-java-to-classes.jar)

		# source files generated from RenderScript must be generated before java compiling