From be2aed5529ba84b480493b8df89f52fd5a0feae7 Mon Sep 17 00:00:00 2001
From: Jiyong Park <jiyong@google.com>
Date: Mon, 2 Dec 2019 14:12:49 +0900
Subject: [PATCH] Use apex_available property

Use apex_available property to prevent modules that are only for the
NN apex from being used outside of the APEX.

Bug: 128708192
Bug: 133140750
Test: m
Change-Id: I57fe857d99088ef08e065dd2a3fc5a9389b6eb0f
---
 core/main.mk | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/core/main.mk b/core/main.mk
index 37a0b98c4f..ad146717be 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -1121,10 +1121,6 @@ APEX_MODULE_LIBS += \
   libdl_android.so \
   libm.so \
 
-# Android Neural Network API (NNAPI) APEX (native) libraries
-APEX_MODULE_LIBS += \
-  libneuralnetworks.so \
-
 # An option to disable the check below, for local use since some build targets
 # still may create these libraries in /system (b/129006418).
 DISABLE_APEX_LIBS_ABSENCE_CHECK ?=