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

Merge changes from topic "am-19343408044c4969a6a5d04724c92f81"

Browse Source 
* changes:
  Merge changes from topic "ota_dexopt_no_ampersand" am: 48b50991ec am: 083bb197bb am: 5a986342cd
  OTA Dexopt: Remove old '&' path am: c260c96b5c am: 188615ead6 am: b030bf0f94
This commit is contained in:
Android Build Merger (Role)
2018-09-19 01:06:00 +00:00
committed by Android (Google) Code Review
parent afcabc35f4 b86e60885b
commit fbb57e6db2
1 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/core/java/com/android/server/pm/OtaDexoptService.java
View File

@@ -53,10 +53,6 @@ public class OtaDexoptService extends IOtaDexopt.Stub {
private final static String TAG = "OTADexopt";
private final static boolean DEBUG_DEXOPT = true;
// The synthetic library dependencies denoting "no checks."
private final static String[] NO_LIBRARIES =
new String[] { PackageDexOptimizer.SKIP_SHARED_LIBRARY_CHECK };
// The amount of "available" (free - low threshold) space necessary at the start of an OTA to
// not bulk-delete unused apps' odex files.
private final static long BULK_DELETE_THRESHOLD = 1024 * 1024 * 1024; // 1GB.
@@ -288,8 +284,8 @@ public class OtaDexoptService extends IOtaDexopt.Stub {
throws InstallerException {
final StringBuilder builder = new StringBuilder();
// The current version.
builder.append("9 ");
// The current version. For v10, see b/115993344.
builder.append("10 ");
builder.append("dexopt");
@@ -338,11 +334,6 @@ public class OtaDexoptService extends IOtaDexopt.Stub {
collectingInstaller, mPackageManagerService.mInstallLock, mContext);
String[] libraryDependencies = pkg.usesLibraryFiles;
if (pkg.isSystem()) {
// For system apps, we want to avoid classpaths checks.
libraryDependencies = NO_LIBRARIES;
}
optimizer.performDexOpt(pkg, libraryDependencies,
null /* ISAs */,