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

Merge "Create secondary dex profiles relative to the provided dex path"

Browse Source
This commit is contained in:
Treehugger Robot
2017-11-14 02:54:59 +00:00
committed by Gerrit Code Review
parent 62893396bd d35451d76b
commit f7f5732e2c
1 changed files with 5 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/java/android/app/DexLoadReporter.java
View File

@@ -19,7 +19,6 @@ package android.app;
import android.os.FileUtils;
import android.os.RemoteException;
import android.os.SystemProperties;
import android.system.ErrnoException;
import android.util.Slog;
import com.android.internal.annotations.GuardedBy;
@@ -27,8 +26,6 @@ import com.android.internal.annotations.GuardedBy;
import dalvik.system.BaseDexClassLoader;
import dalvik.system.VMRuntime;
import libcore.io.Libcore;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
@@ -156,23 +153,12 @@ import java.util.Set;
return;
}
File realDexPath;
try {
// Secondary dex profiles are stored in the oat directory, next to the real dex file
// and have the same name with 'cur.prof' appended. We use the realpath because that
// is what installd is using when processing the dex file.
// NOTE: Keep in sync with installd.
realDexPath = new File(Libcore.os.realpath(dexPath));
} catch (ErrnoException ex) {
Slog.e(TAG, "Failed to get the real path of secondary dex " + dexPath
+ ":" + ex.getMessage());
// Do not continue with registration if we could not retrieve the real path.
return;
}
// Secondary dex profiles are stored in the oat directory, next to dex file
// and have the same name with 'cur.prof' appended.
// NOTE: Keep this in sync with installd expectations.
File secondaryProfileDir = new File(realDexPath.getParent(), "oat");
File secondaryProfile = new File(secondaryProfileDir, realDexPath.getName() + ".cur.prof");
File dexPathFile = new File(dexPath);
File secondaryProfileDir = new File(dexPathFile.getParent(), "oat");
File secondaryProfile = new File(secondaryProfileDir, dexPathFile.getName() + ".cur.prof");
// Create the profile if not already there.
// Returns true if the file was created, false if the file already exists.