summaryrefslogtreecommitdiff
path: root/libnativeloader/library_namespaces.cpp
diff options
context:
space:
mode:
authorJustin Yun <justinyun@google.com>2019-12-16 14:09:39 +0900
committerTreehugger Robot <treehugger-gerrit@google.com>2020-01-07 04:55:22 +0000
commit3db26d596bdc969b6d0e8646ac0ab64346b7ee21 (patch)
tree386588c223eebaeb3de168640ce2b63e299c1ae5 /libnativeloader/library_namespaces.cpp
parent3a6ef94d9e756449c490a535962760744e94f458 (diff)
Make product libs available to unbundled product apks.
Unbundling product apps must be triggerred if the target is enforcing the product interfaces. The device must have ro.product.vndk.version property if its product interface is enforced. Unbundled product apps can use product libraries. Bug: 144534640 Bug: 127738095 Bug: 128557860 Test: check boot and basic features Change-Id: I32b2a1bd3e4f62b6acdbfab6bd277ec1132478a2
Diffstat (limited to 'libnativeloader/library_namespaces.cpp')
-rw-r--r--libnativeloader/library_namespaces.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/libnativeloader/library_namespaces.cpp b/libnativeloader/library_namespaces.cpp
index c01f80464a..891d75e160 100644
--- a/libnativeloader/library_namespaces.cpp
+++ b/libnativeloader/library_namespaces.cpp
@@ -173,7 +173,8 @@ Result<NativeLoaderNamespace*> LibraryNamespaces::Create(JNIEnv* env, uint32_t t
std::string namespace_name = kClassloaderNamespaceName;
bool unbundled_vendor_or_product_app = false;
if ((apk_origin == APK_ORIGIN_VENDOR ||
- (apk_origin == APK_ORIGIN_PRODUCT && target_sdk_version > 29)) &&
+ (apk_origin == APK_ORIGIN_PRODUCT &&
+ is_product_vndk_version_defined())) &&
!is_shared) {
unbundled_vendor_or_product_app = true;
// For vendor / product apks, give access to the vendor / product lib even though