From 0cc40277ffb5f59eac672d844723920ad5f12d85 Mon Sep 17 00:00:00 2001
From: Justin Yun <justinyun@google.com>
Date: Mon, 16 Dec 2019 16:47:40 +0900
Subject: Read system_ext partition for partner defined public libraries.

Let partners define system libraries in system_ext for their apps.
They can list the libraries in
/system_ext/etc/public.libraries-<companyname>.txt for their apps to
use.

Bug: 134909174
Bug: 134359158
Test: build and boot
Change-Id: I4edc6c19c4e23e2fec2d98aca7a1e4fd64fd5f2e
---
 libnativeloader/public_libraries.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'libnativeloader/public_libraries.cpp')

diff --git a/libnativeloader/public_libraries.cpp b/libnativeloader/public_libraries.cpp
index 11c30701d9..1ab9a30d54 100644
--- a/libnativeloader/public_libraries.cpp
+++ b/libnativeloader/public_libraries.cpp
@@ -232,13 +232,15 @@ static std::string InitVendorPublicLibraries() {
   return android::base::Join(*sonames, ':');
 }
 
-// read /system/etc/public.libraries-<companyname>.txt and
+// read /system/etc/public.libraries-<companyname>.txt,
+// /system_ext/etc/public.libraries-<companyname>.txt and
 // /product/etc/public.libraries-<companyname>.txt which contain partner defined
 // system libs that are exposed to apps. The libs in the txt files must be
 // named as lib<name>.<companyname>.so.
 static std::string InitExtendedPublicLibraries() {
   std::vector<std::string> sonames;
   ReadExtensionLibraries("/system/etc", &sonames);
+  ReadExtensionLibraries("/system_ext/etc", &sonames);
   ReadExtensionLibraries("/product/etc", &sonames);
   return android::base::Join(sonames, ':');
 }
-- 
cgit v1.2.3-59-g8ed1b