commit f67c72b34d063ba82548172f66c04202aa11c94b
author Przemyslaw Szczepaniak <pszczepaniak@google.com> Fri Jul 12 14:04:43 2019 +0100
committer Przemyslaw Szczepaniak <pszczepaniak@google.com> Fri Jul 19 16:41:48 2019 +0100
tree a259682f969039ae1f02a45553d931b211e6207f
parent 34e90798e59d29689821da402aea6462f9f6fb59

Move libneuralnetworks.so to com.android.neuralnetworks APEX

Test: build&flashed crosshatch image
Bug: 137320025

Change-Id: Iadbb32cffc636c515a5e89b62539183ebc0c2f14

target/product/gsi/Android.mk

diff --git a/target/product/gsi/Android.mk b/target/product/gsi/Android.mk
index 5693234..75c5ade 100644
--- a/target/product/gsi/Android.mk
+++ b/target/product/gsi/Android.mk
@@ -101,8 +101,10 @@
 
 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 \