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

Merge "Support to pass <uses-library> option through to dex2oat."

Browse Source
This commit is contained in:
Jeff Hao
2016-04-22 18:20:11 +00:00
committed by Android (Google) Code Review
parent b7629c0620 7b331b6a8a
commit e1d41fcc0d
7 changed files with 72 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/android/app/LoadedApk.java
View File

@@ -356,14 +356,18 @@ public final class LoadedApk {
if (instrumentationSplitAppDirs != null) {
Collections.addAll(outZipPaths, instrumentationSplitAppDirs);
}
outZipPaths.add(instrumentedAppDir);
if (instrumentedSplitAppDirs != null) {
Collections.addAll(outZipPaths, instrumentedSplitAppDirs);
if (!instrumentationAppDir.equals(instrumentedAppDir)) {
outZipPaths.add(instrumentedAppDir);
if (instrumentedSplitAppDirs != null) {
Collections.addAll(outZipPaths, instrumentedSplitAppDirs);
}
}
if (outLibPaths != null) {
outLibPaths.add(instrumentationLibDir);
outLibPaths.add(instrumentedLibDir);
if (!instrumentationLibDir.equals(instrumentedLibDir)) {
outLibPaths.add(instrumentedLibDir);
}
}
if (!instrumentedAppDir.equals(instrumentationAppDir)) {