DO NOT MERGE Do not check product unbundled from Q

This code should be enabled from R, but for some devices it just works
because of target SDK + no /product/lib directory. To avoid confusion
this code should be removed from Q release

Bug: 129011845
Test: m -j
Change-Id: I4d85cbcb5e2cbe694ec065f4e3d060eb74f542ba
This commit is contained in:
Kiyoung Kim
2019-04-12 10:52:43 +09:00
parent 20d039537f
commit be955e81b1

View File

@@ -781,16 +781,6 @@ public final class LoadedApk {
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);
String libraryPermittedPath = mDataDir;