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

Commit 32d05935 authored by Jiyong Park's avatar Jiyong Park Committed by android-build-merger
Browse files

Merge "Embed jni libs in vendor apks for treble-ized devices" am: 5aada52f...

Merge "Embed jni libs in vendor apks for treble-ized devices" am: 5aada52f am: 7423f3ab am: bc70f0a3
am: f63ac32a

Change-Id: Ic080b84fcc0ae561e59f06a92a912087f1be5ab2
parents b1c7f7b4 f63ac32a
Loading
Loading
Loading
Loading
+13 −3
Original line number Diff line number Diff line
@@ -18,10 +18,20 @@ endif
ifneq ($(filter tests samples, $(LOCAL_MODULE_TAGS)),)
my_embed_jni := true
endif
ifneq ($(BOARD_VNDK_VERSION),)
  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 partitions.
    # 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_abis :=