Merge "Don't embed vendor libs into vendor apks." am: 30c0278ae1

am: 65552d3c1d

Change-Id: I9edb24d2edceb9614573e797000e694d11bc7cc2
This commit is contained in:
Jiyong Park 2017-12-06 04:27:14 +00:00 committed by android-build-merger
commit ad0cb5a379
1 changed files with 3 additions and 13 deletions

View File

@ -18,19 +18,9 @@ endif
ifneq ($(filter tests samples, $(LOCAL_MODULE_TAGS)),)
my_embed_jni := true
endif
ifeq ($(PRODUCT_FULL_TREBLE),true)
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
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
ifeq ($(filter $(TARGET_OUT)/% $(TARGET_OUT_VENDOR)/% $(TARGET_OUT_OEM)/%, $(my_module_path)),)
# If this app isn't to be installed to system partitions.
my_embed_jni := true
endif
# If we're installing this APP as a compressed module, we include all JNI libraries
# in the compressed artifact, rather than as separate files on the partition in question.