Merge changes from topic "am-19343408044c4969a6a5d04724c92f81" (fbb57e6d) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/pm/OtaDexoptService.java

+2 −11

Original line number	Diff line number	Diff line
		@@ -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 */,