From d670d5866754beca43a217ef5013b5acd1976e78 Mon Sep 17 00:00:00 2001 From: Richard Uhler Date: Thu, 8 Dec 2016 10:33:09 +0000 Subject: [PATCH] Cleanup code given PATCHOAT_FOR_RELOCATION has been removed. Test: make, device boots, installed an app Test: adb shell cmd package compile -m speed|speed-profile Bug: 33192586 Change-Id: I8ef7d4926773586251fedf8a7737a8005f119859 --- .../server/pm/PackageDexOptimizer.java | 23 ++++--------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/services/core/java/com/android/server/pm/PackageDexOptimizer.java b/services/core/java/com/android/server/pm/PackageDexOptimizer.java index 30ff32bd3ee89..aeac7f69ee4f2 100644 --- a/services/core/java/com/android/server/pm/PackageDexOptimizer.java +++ b/services/core/java/com/android/server/pm/PackageDexOptimizer.java @@ -217,26 +217,11 @@ class PackageDexOptimizer { dexoptNeeded); } - final String dexoptType; - String oatDir = null; - boolean isOdexLocation = (dexoptNeeded < 0); - switch (Math.abs(dexoptNeeded)) { - case DexFile.NO_DEXOPT_NEEDED: - continue; - case DexFile.DEX2OAT_FROM_SCRATCH: - case DexFile.DEX2OAT_FOR_BOOT_IMAGE: - case DexFile.DEX2OAT_FOR_FILTER: - case DexFile.DEX2OAT_FOR_RELOCATION: - dexoptType = "dex2oat"; - oatDir = createOatDirIfSupported(pkg, dexCodeInstructionSet); - break; - case DexFile.PATCHOAT_FOR_RELOCATION: - dexoptType = "patchoat"; - break; - default: - throw new IllegalStateException("Invalid dexopt:" + dexoptNeeded); + if (dexoptNeeded == DexFile.NO_DEXOPT_NEEDED) { + continue; } + String oatDir = createOatDirIfSupported(pkg, dexCodeInstructionSet); String sharedLibrariesPath = null; if (sharedLibraries != null && sharedLibraries.length != 0) { StringBuilder sb = new StringBuilder(); @@ -248,7 +233,7 @@ class PackageDexOptimizer { } sharedLibrariesPath = sb.toString(); } - Log.i(TAG, "Running dexopt (" + dexoptType + ") on: " + path + " pkg=" + Log.i(TAG, "Running dexopt on: " + path + " pkg=" + pkg.applicationInfo.packageName + " isa=" + dexCodeInstructionSet + " vmSafeMode=" + vmSafeMode + " debuggable=" + debuggable + " target-filter=" + targetCompilerFilter + " oatDir = " + oatDir