From f19117c560f4499d07702dce55cb8537f09c3864 Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Tue, 14 Nov 2017 10:50:59 +0900 Subject: [PATCH] Don't embed vendor libs into vendor apks. Vendor apk can now access /vendor/lib. So there is no need for us to embed the vendor libs into vendor apks. Reverting the old commits. Revert "Embedding the JNI lib is controlled by PRODUCT_FULL_TREBLE" This reverts commit a6b038ff4c57bf18598f7827f4bcad5da5f963a7. Revert "Embed jni libs in vendor apks for treble-ized devices" This reverts commit 1cb8dea625b442880e3aac9104f687826417654d. Bug: 69272876 Test: m -j ModemDiagnosticSystem (a vendor apk having JNI libs in walleye) unzip -l /vendor/app/ModemDiagnosticSystem/ModemDiagnosticSystem.apk does not have libmdsdiag.so in it. The so file is found in /vendor/lib64. Change-Id: I7b96aa56b39bc45aca4810e6fb3f41ce2a1fc095 --- core/install_jni_libs.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/core/install_jni_libs.mk b/core/install_jni_libs.mk index 6b550c1c0..625a8a222 100644 --- a/core/install_jni_libs.mk +++ b/core/install_jni_libs.mk @@ -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 jni_shared_libraries :=