From f67c72b34d063ba82548172f66c04202aa11c94b Mon Sep 17 00:00:00 2001
From: Przemyslaw Szczepaniak <pszczepaniak@google.com>
Date: Fri, 12 Jul 2019 14:04:43 +0100
Subject: [PATCH] Move libneuralnetworks.so to com.android.neuralnetworks APEX

Test: build&flashed crosshatch image
Bug: 137320025

Change-Id: Iadbb32cffc636c515a5e89b62539183ebc0c2f14
---
 core/main.mk                  | 1 +
 target/product/base_system.mk | 5 ++++-
 target/product/gsi/Android.mk | 4 +++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/core/main.mk b/core/main.mk
index 9182fa7b93..100099a341 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -1244,6 +1244,7 @@ APEX_MODULE_LIBS := \
   libnativebridge.so \
   libnativehelper.so \
   libnativeloader.so \
+  libneuralnetworks.so \
   libnpt.so \
   libopenjdk.so \
   libopenjdkjvm.so \
diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index 162fbedca5..01b2c9ea5d 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -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 \
diff --git a/target/product/gsi/Android.mk b/target/product/gsi/Android.mk
index 56932342cc..75c5adea02 100644
--- a/target/product/gsi/Android.mk
+++ b/target/product/gsi/Android.mk
@@ -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 \