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

Commit bb397b0a authored by Anton Hansson's avatar Anton Hansson
Browse files

Support app shared libs in /product and /product_services.

This whitelist controls which partitions support installing an app's
libraries in the partition's lib folder as opposed to embedding
them in the APK itself. Update it to also include /product and
/product_services.

Also add some clarifying comments.

Bug: 111797707
Test: in internal branch
Change-Id: I756af46cc9b718ca669dacc9d25364edddb295f4
parent 385ba5c4
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
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 the APK is not installed in one of the following partitions, force its libraries
# to be embedded inside the APK instead of installed to /<partition>/lib[64]/.
supported_partition_patterns := \
    $(TARGET_OUT)/% \
    $(TARGET_OUT_VENDOR)/% \
    $(TARGET_OUT_OEM)/% \
    $(TARGET_OUT_PRODUCT)/% \
    $(TARGET_OUT_PRODUCT_SERVICES)/% \

ifeq ($(filter $(supported_partition_patterns),$(my_module_path)),)
    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.
ifdef LOCAL_COMPRESSED_MODULE