Merge "Add a command line option to optimize individual splits" (2b8d44f9) · Commits · e / os / android_frameworks_base

core/java/android/content/pm/IPackageManager.aidl

+1 −1

Original line number	Diff line number	Diff line
		@@ -514,7 +514,7 @@ interface IPackageManager {
		* definite state.
		*/
		boolean performDexOptMode(String packageName, boolean checkProfiles,
		String targetCompilerFilter, boolean force, boolean bootComplete);
		String targetCompilerFilter, boolean force, boolean bootComplete, String splitName);

		/**
		* Ask the package manager to perform a dex-opt with the given compiler filter on the

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

+8 −0

Original line number	Diff line number	Diff line
		@@ -162,6 +162,14 @@ public class PackageDexOptimizer {
		}
		// Append shared libraries with split dependencies for this split.
		String path = paths.get(i);
		if (options.getSplitName() != null) {
		// We are asked to compile only a specific split. Check that the current path is
		// what we are looking for.
		if (!options.getSplitName().equals(new File(path).getName())) {
		continue;
		}
		}

		String sharedLibrariesPathWithSplits;
		if (sharedLibrariesPath != null && splitDependencies[i] != null) {
		sharedLibrariesPathWithSplits = sharedLibrariesPath + ":" + splitDependencies[i];

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

+3 −2

Original line number	Diff line number	Diff line
		@@ -9479,11 +9479,12 @@ public class PackageManagerService extends IPackageManager.Stub
		@Override
		public boolean performDexOptMode(String packageName,
		boolean checkProfiles, String targetCompilerFilter, boolean force,
		boolean bootComplete) {
		boolean bootComplete, String splitName) {
		int flags = (checkProfiles ? DexoptOptions.DEXOPT_CHECK_FOR_PROFILES_UPDATES : 0) \|
		(force ? DexoptOptions.DEXOPT_FORCE : 0) \|
		(bootComplete ? DexoptOptions.DEXOPT_BOOT_COMPLETE : 0);
		return performDexOpt(new DexoptOptions(packageName, targetCompilerFilter, flags));
		return performDexOpt(new DexoptOptions(packageName, targetCompilerFilter,
		splitName, flags));
		}

		/**

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

+17 −2

Original line number	Diff line number	Diff line
		@@ -365,6 +365,7 @@ class PackageManagerShellCommand extends ShellCommand {
		String compilationReason = null;
		String checkProfilesRaw = null;
		boolean secondaryDex = false;
		String split = null;

		String opt;
		while ((opt = getNextOption()) != null) {
		@@ -395,6 +396,9 @@ class PackageManagerShellCommand extends ShellCommand {
		case "--secondary-dex":
		secondaryDex = true;
		break;
		case "--split":
		split = getNextArgRequired();
		break;
		default:
		pw.println("Error: Unknown option: " + opt);
		return 1;
		@@ -423,6 +427,16 @@ class PackageManagerShellCommand extends ShellCommand {
		return 1;
		}

		if (allPackages && split != null) {
		pw.println("-a cannot be specified together with --split");
		return 1;
		}

		if (secondaryDex && split != null) {
		pw.println("--secondary-dex cannot be specified together with --split");
		return 1;
		}

		String targetCompilerFilter;
		if (compilerFilter != null) {
		if (!DexFile.isValidCompilerFilter(compilerFilter)) {
		@@ -472,7 +486,7 @@ class PackageManagerShellCommand extends ShellCommand {
		targetCompilerFilter, forceCompilation)
		: mInterface.performDexOptMode(packageName,
		checkProfiles, targetCompilerFilter, forceCompilation,
		true /* bootComplete */);
		true /* bootComplete */, split);
		if (!result) {
		failedPackages.add(packageName);
		}
		@@ -1609,7 +1623,7 @@ class PackageManagerShellCommand extends ShellCommand {
		pw.println(" help");
		pw.println(" Print this help text.");
		pw.println("");
		pw.println(" compile [-m MODE \| -r REASON] [-f] [-c]");
		pw.println(" compile [-m MODE \| -r REASON] [-f] [-c] [--split SPLIT_NAME]");
		pw.println(" [--reset] [--check-prof (true \| false)] (-a \| TARGET-PACKAGE)");
		pw.println(" Trigger compilation of TARGET-PACKAGE or all packages if \"-a\".");
		pw.println(" Options:");
		@@ -1635,6 +1649,7 @@ class PackageManagerShellCommand extends ShellCommand {
		pw.println(" --reset: restore package to its post-install state");
		pw.println(" --check-prof (true \| false): look at profiles when doing dexopt?");
		pw.println(" --secondary-dex: compile app secondary dex files");
		pw.println(" --split SPLIT: compile only the given split name");
		pw.println(" bg-dexopt-job");
		pw.println(" Execute the background optimizations immediately.");
		pw.println(" Note that the command only runs the background optimizer logic. It may");

services/core/java/com/android/server/pm/dex/DexoptOptions.java

+19 −4

Original line number	Diff line number	Diff line
		@@ -18,6 +18,8 @@ package com.android.server.pm.dex;

		import static com.android.server.pm.PackageManagerServiceCompilerMapping.getCompilerFilterForReason;

		import android.annotation.Nullable;

		/**
		* Options used for dexopt invocations.
		*/
		@@ -58,7 +60,19 @@ public final class DexoptOptions {
		// The set of flags for the dexopt options. It's a mix of the DEXOPT_* flags.
		private final int mFlags;

		// When not null, dexopt will optimize only the split identified by this name.
		// It only applies for primary apk and it's always null if mOnlySecondaryDex is true.
		private final String mSplitName;

		public DexoptOptions(String packageName, String compilerFilter, int flags) {
		this(packageName, compilerFilter, /splitName/ null, flags);
		}

		public DexoptOptions(String packageName, int compilerReason, int flags) {
		this(packageName, getCompilerFilterForReason(compilerReason), flags);
		}

		public DexoptOptions(String packageName, String compilerFilter, String splitName, int flags) {
		int validityMask =
		DEXOPT_CHECK_FOR_PROFILES_UPDATES \|
		DEXOPT_FORCE \|
		@@ -73,10 +87,7 @@ public final class DexoptOptions {
		mPackageName = packageName;
		mCompilerFilter = compilerFilter;
		mFlags = flags;
		}

		public DexoptOptions(String packageName, int compilerReason, int flags) {
		this(packageName, getCompilerFilterForReason(compilerReason), flags);
		mSplitName = splitName;
		}

		public String getPackageName() {
		@@ -110,4 +121,8 @@ public final class DexoptOptions {
		public boolean isDowngrade() {
		return (mFlags & DEXOPT_DOWNGRADE) != 0;
		}

		public String getSplitName() {
		return mSplitName;
		}
		}