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

Commit b4befed8 authored by Przemyslaw Szczepaniak's avatar Przemyslaw Szczepaniak Committed by Gerrit Code Review
Browse files

Merge "Move libneuralnetworks.so to com.android.neuralnetworks APEX"

parents 5358b924 f67c72b3

core/main.mk

+1 −0
Original line number Diff line number Diff line
@@ -1244,6 +1244,7 @@ APEX_MODULE_LIBS := \ 
  libnativebridge.so \

  libnativehelper.so \

  libnativeloader.so \

  libneuralnetworks.so \

  libnpt.so \

  libopenjdk.so \

  libopenjdkjvm.so \

target/product/base_system.mk

+4 −1
Original line number Diff line number Diff line
@@ -19,6 +19,9 @@ PRODUCT_PACKAGES += \ 
    abb \

    adbd \

    am \

    android.hardware.neuralnetworks@1.0 \

    android.hardware.neuralnetworks@1.1 \

    android.hardware.neuralnetworks@1.2 \

    android.hidl.allocator@1.0-service \

    android.hidl.base-V1.0-java \

    android.hidl.manager-V1.0-java \
@@ -53,6 +56,7 @@ PRODUCT_PACKAGES += \ 
    com.android.conscrypt \

    com.android.location.provider \

    com.android.resolv \

    com.android.neuralnetworks \

    com.android.tzdata \

    ContactsProvider \

    content \
@@ -154,7 +158,6 @@ PRODUCT_PACKAGES += \ 
    libnetd_client \

    libnetlink \

    libnetutils \

    libneuralnetworks \

    libOpenMAXAL \

    libOpenSLES \

    libpdfium \

target/product/gsi/Android.mk

+3 −1
Original line number Diff line number Diff line
@@ -142,8 +142,10 @@ ifneq ($(BOARD_VNDK_VERSION),) 


include $(CLEAR_VARS)

LOCAL_MODULE := vndk_package

# Filter LLNDK libs moved to APEX to avoid pulling them into /system/LIB

LOCAL_REQUIRED_MODULES := \

    $(LLNDK_LIBRARIES)

    $(filter-out $(LLNDK_MOVED_TO_APEX_LIBRARIES),$(LLNDK_LIBRARIES)))



ifneq ($(TARGET_SKIP_CURRENT_VNDK),true)

LOCAL_REQUIRED_MODULES += \

    llndk.libraries.txt \