diff options
| author | Ying Wang <wangying@google.com> | 2014-09-30 17:32:58 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2014-09-30 17:32:58 -0700 |
| commit | fc6d5b6a947fa80061778639290c0241b93635b4 (patch) | |
| tree | 2b98b5b6d9d7e7bed22f01ebd923a5efe2cdd01b /core/base_rules.mk | |
| parent | c168b6e27aa48c1d5552ed9143eeb00d2c9860a5 (diff) | |
| download | build-fc6d5b6a947fa80061778639290c0241b93635b4.zip build-fc6d5b6a947fa80061778639290c0241b93635b4.tar.gz build-fc6d5b6a947fa80061778639290c0241b93635b4.tar.bz2 | |
Allow to add jar resource or manifest even without Java code.
Change-Id: I2d8fd93f004d9e0c29c71b887810b2624769789e
Diffstat (limited to 'core/base_rules.mk')
| -rw-r--r-- | core/base_rules.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/base_rules.mk b/core/base_rules.mk index 7663ee2..8c25897 100644 --- a/core/base_rules.mk +++ b/core/base_rules.mk @@ -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 ########################################################### |