Allow to add jar resource or manifest even without Java code. (fc6d5b6a) · Commits · e / os / android_build

core/base_rules.mk

+4 −4

Original line number	Diff line number	Diff line
		@@ -402,7 +402,6 @@ endif # current or system_current
		endif # LOCAL_SDK_VERSION
		endif # TARGET_
		$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_RESOURCE_DIR := $(LOCAL_RESOURCE_DIR)
		$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_EXTRA_JAR_ARGS := $(extra_jar_args)
		$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_ASSET_DIR := $(LOCAL_ASSET_DIR)
		$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_STATIC_JAVA_LIBRARIES := $(full_static_java_libs)

		@@ -464,6 +463,10 @@ ifdef LOCAL_INSTRUMENTATION_FOR
		full_java_lib_deps += $(link_instr_classes_jar)
		endif

		endif # need_compile_java

		# We may want to add jar manifest or jar resource files even if there is no java code at all.
		$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_EXTRA_JAR_ARGS := $(extra_jar_args)
		jar_manifest_file :=
		ifneq ($(strip $(LOCAL_JAR_MANIFEST)),)
		jar_manifest_file := $(LOCAL_PATH)/$(LOCAL_JAR_MANIFEST)
		@@ -472,9 +475,6 @@ else
		$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JAR_MANIFEST :=
		endif

		endif # need_compile_java


		###########################################################
		## make clean- targets
		###########################################################