openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Use direct dependency on the JNI so files. 

With the order-only dependency if the jni so files is updated,
make won't rebuild the system.img, which has dependency only on the apk
file.

Bug: 24865400
Change-Id: I9d5bee82b8a712a2c24dabaa0cd4c50174ea219f
This commit is contained in:
Ying Wang 2015-10-15 15:29:01 -07:00
parent 7d3690eb35
commit d358f826e7
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/install_jni_libs_internal.mk
View File

@ -55,7 +55,8 @@ ifneq ($(my_jni_shared_libraries),)
my_jni_filenames := $(notdir $(my_jni_shared_libraries)) my_jni_filenames := $(notdir $(my_jni_shared_libraries))
# Make sure the JNI libraries get installed # Make sure the JNI libraries get installed
my_shared_library_path := $($(my_2nd_arch_prefix)TARGET_OUT$(partition_tag)_SHARED_LIBRARIES) my_shared_library_path := $($(my_2nd_arch_prefix)TARGET_OUT$(partition_tag)_SHARED_LIBRARIES)
$(LOCAL_INSTALLED_MODULE) : | $(addprefix $(my_shared_library_path)/, $(my_jni_filenames)) # Do not use order-only dependency, because we want to rebuild the image if an jni is updated.
$(LOCAL_INSTALLED_MODULE) : $(addprefix $(my_shared_library_path)/, $(my_jni_filenames))
# Create symlink in the app specific lib path # Create symlink in the app specific lib path
ifdef LOCAL_POST_INSTALL_CMD ifdef LOCAL_POST_INSTALL_CMD
@ -93,7 +94,7 @@ else # not my_embed_jni
$(foreach lib, $(my_prebuilt_jni_libs), \ $(foreach lib, $(my_prebuilt_jni_libs), \
$(eval $(call copy-one-file, $(lib), $(my_app_lib_path)/$(notdir $(lib))))) $(eval $(call copy-one-file, $(lib), $(my_app_lib_path)/$(notdir $(lib)))))
$(LOCAL_INSTALLED_MODULE) : | $(addprefix $(my_app_lib_path)/, $(notdir $(my_prebuilt_jni_libs))) $(LOCAL_INSTALLED_MODULE) : $(addprefix $(my_app_lib_path)/, $(notdir $(my_prebuilt_jni_libs)))
endif # my_embed_jni endif # my_embed_jni
endif # inner my_prebuilt_jni_libs endif # inner my_prebuilt_jni_libs
endif # outer my_prebuilt_jni_libs endif # outer my_prebuilt_jni_libs