Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 65552d3c authored by Jiyong Park's avatar Jiyong Park Committed by android-build-merger
Browse files

Merge "Don't embed vendor libs into vendor apks."

am: 30c0278a

Change-Id: I16d8a9371b6ea699f22781eda61c345537bd73ef
parents ca989663 30c0278a
Loading
Loading
Loading
Loading
+3 −13
Original line number Diff line number Diff line
@@ -18,20 +18,10 @@ 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.
# If this app isn't to be installed to system partitions.
my_embed_jni := true
endif
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.
ifdef LOCAL_COMPRESSED_MODULE