commit ee752f10ed9f7aaec17c0b24b728144079f9c942
author Kiyoung Kim <kiyoungkim@google.com> Wed Sep 25 21:30:17 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Sep 25 21:30:17 2019 -0700
tree df13eb75c21e863e7def7b5dab23a7a20e7abc7e
parent ac51c614a12b9b58c019fbff36f46832ef42ed5f
parent 96d3e3c7cdc9293d0d2ce114f838709db298f456

Add libneuralnetworks_packageinfo.so in neuralnetworks link am: d1861bc9f4 am: c35045632f
am: 96d3e3c7cd

Change-Id: I983da9124a87dbb4455d18f6435bc0fd3f021b16

contents/namespace/neuralnetworks.cc

diff --git a/contents/namespace/neuralnetworks.cc b/contents/namespace/neuralnetworks.cc
index b29d44f..0c2e759 100644
--- a/contents/namespace/neuralnetworks.cc
+++ b/contents/namespace/neuralnetworks.cc
@@ -29,14 +29,17 @@
   ns.AddSearchPath("/apex/com.android.neuralnetworks/${LIB}",
                    AsanPath::SAME_PATH);
 
-  ns.CreateLink("default").AddSharedLib({"libc.so",
-                                         "libcgrouprc.so",
-                                         "libdl.so",
-                                         "liblog.so",
-                                         "libm.so",
-                                         "libnativewindow.so",
-                                         "libsync.so",
-                                         "libvndksupport.so"});
+  std::string link_target = ctx.IsVendorSection() ? "system" : "default";
+  ns.CreateLink(link_target)
+      .AddSharedLib({"libc.so",
+                     "libcgrouprc.so",
+                     "libdl.so",
+                     "liblog.so",
+                     "libm.so",
+                     "libnativewindow.so",
+                     "libneuralnetworks_packageinfo.so",
+                     "libsync.so",
+                     "libvndksupport.so"});
 
   return ns;
 }