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

Merge "Embed jni libs in vendor apks for treble-ized devices" into oc-dev

This commit is contained in:
TreeHugger Robot 2017-05-17 09:41:54 +00:00 committed by Android (Google) Code Review
parent 2e8ce7628d e1a3b367fe
commit f99f37b243
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/install_jni_libs.mk
View File

@ -18,10 +18,20 @@ endif
ifneq ($(filter tests samples, $(LOCAL_MODULE_TAGS)),) ifneq ($(filter tests samples, $(LOCAL_MODULE_TAGS)),)
my_embed_jni := true my_embed_jni := true
endif endif
ifeq ($(filter $(TARGET_OUT)/% $(TARGET_OUT_VENDOR)/% $(TARGET_OUT_OEM)/%, $(my_module_path)),) ifeq ($(PRODUCT_FULL_TREBLE),true)
# If this app isn't to be installed to system partitions. ifeq ($(filter $(TARGET_OUT)/%, $(my_module_path)),)
# If this app isn't to be installed to the system partition, and the device
# is fully treble-ized then jni libs are embedded, Otherwise, access to the
# directory where the lib is installed to (usually /vendor/lib) needs to be
# allowed for system processes, which is a Treble violation.
my_embed_jni := true my_embed_jni := true
endif endif
else
ifeq ($(filter $(TARGET_OUT)/% $(TARGET_OUT_VENDOR)/% $(TARGET_OUT_OEM)/%, $(my_module_path)),)
# If this app isn't to be installed to system, vendor, or oem partitions.
my_embed_jni := true
endif
endif
jni_shared_libraries := jni_shared_libraries :=
jni_shared_libraries_abis := jni_shared_libraries_abis :=