Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Mark product apks as unbundled"

Browse Source
This commit is contained in:
Treehugger Robot
2019-03-19 14:02:59 +00:00
committed by Gerrit Code Review
parent 93bf5ef495 dd6861e6ff
commit 856ef55672
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/app/LoadedApk.java
View File

@@ -760,6 +760,16 @@ public final class LoadedApk {
isBundledApp = false; isBundledApp = false;
} }
// Similar to vendor apks, we should add /product/lib for apks from product partition
// and not having /product/lib in the default search path
final boolean treatProductApkAsUnbundled = !defaultSearchPaths.contains("/product/lib");
if (mApplicationInfo.getCodePath() != null
&& mApplicationInfo.isProduct() && treatProductApkAsUnbundled
// TODO(b/128557860): Change target SDK version when version code R is available.
&& getTargetSdkVersion() == Build.VERSION_CODES.CUR_DEVELOPMENT) {
isBundledApp = false;
}
makePaths(mActivityThread, isBundledApp, mApplicationInfo, zipPaths, libPaths); makePaths(mActivityThread, isBundledApp, mApplicationInfo, zipPaths, libPaths);
String libraryPermittedPath = mDataDir; String libraryPermittedPath = mDataDir;