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

Commit f67c72b3 authored by Przemyslaw Szczepaniak's avatar Przemyslaw Szczepaniak
Browse files

Move libneuralnetworks.so to com.android.neuralnetworks APEX 

Test: build&flashed crosshatch image
Bug: 137320025

Change-Id: Iadbb32cffc636c515a5e89b62539183ebc0c2f14
parent 34e90798

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 \
@@ -153,7 +157,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
@@ -101,8 +101,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 \