Refactor public_libraries.*
- shorten the long const variables
- merge {oem|product}_public_libraries into extended_public_libraries
Bug: 130388701
Test: build & pass presubmit tests
Change-Id: I43be555041466118f2b2d188f5da3ff0d8ed7d8d
diff --git a/libnativeloader/public_libraries.h b/libnativeloader/public_libraries.h
index a211907..9b6dea8 100644
--- a/libnativeloader/public_libraries.h
+++ b/libnativeloader/public_libraries.h
@@ -22,13 +22,11 @@
// These provide the list of libraries that are available to the namespace for apps.
// Not all of the libraries are available to apps. Depending on the context,
// e.g., if it is a vendor app or not, different set of libraries are made available.
-// TODO(b/130388701) rename these.
-const std::string& system_public_libraries();
+const std::string& default_public_libraries();
const std::string& runtime_public_libraries();
const std::string& vendor_public_libraries();
-const std::string& oem_public_libraries();
-const std::string& product_public_libraries();
-const std::string& system_llndk_libraries();
-const std::string& system_vndksp_libraries();
+const std::string& extended_public_libraries();
+const std::string& llndk_libraries();
+const std::string& vndksp_libraries();
}; // namespace android::nativeloader