p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

am: 5aada52ffb

Change-Id: I10902684187e4b6db4f8a8ec3921d19c07edf13c
This commit is contained in:
Jiyong Park 2017-04-25 21:15:14 +00:00 committed by android-build-merger
parent d7214ec091 5aada52ffb
commit 7423f3ab11
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/install_jni_libs.mk
View File

@ -18,9 +18,19 @@ 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)),) ifneq ($(BOARD_VNDK_VERSION),)
# If this app isn't to be installed to system partitions. ifeq ($(filter $(TARGET_OUT)/%, $(my_module_path)),)
my_embed_jni := true # 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
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 endif
jni_shared_libraries := jni_shared_libraries :=