diff options
| author | Elliott Hughes <enh@google.com> | 2014-04-25 00:25:33 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-25 00:25:33 +0000 |
| commit | 7406d4e17dd39f3531e764ec7788b1f8dec99971 (patch) | |
| tree | 9a21386b4b90e6a5f1c88d1e65b83e6190aeba37 /dalvik | |
| parent | f52edb91eecad1a2578129a1966dca87b89633c3 (diff) | |
| parent | 3eb545e382a12565ed8779632015d736d6f5c32c (diff) | |
| download | libcore-7406d4e17dd39f3531e764ec7788b1f8dec99971.zip libcore-7406d4e17dd39f3531e764ec7788b1f8dec99971.tar.gz libcore-7406d4e17dd39f3531e764ec7788b1f8dec99971.tar.bz2 | |
am 3eb545e3: am 85fa4285: Merge "Groundwork towards making the Libcore.os functionality public."
* commit '3eb545e382a12565ed8779632015d736d6f5c32c':
Groundwork towards making the Libcore.os functionality public.
Diffstat (limited to 'dalvik')
| -rw-r--r-- | dalvik/src/main/java/dalvik/system/DexFile.java | 4 | ||||
| -rw-r--r-- | dalvik/src/main/java/dalvik/system/DexPathList.java | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/dalvik/src/main/java/dalvik/system/DexFile.java b/dalvik/src/main/java/dalvik/system/DexFile.java index d0bfe5f..f1a8013 100644 --- a/dalvik/src/main/java/dalvik/system/DexFile.java +++ b/dalvik/src/main/java/dalvik/system/DexFile.java @@ -16,15 +16,15 @@ package dalvik.system; +import android.system.ErrnoException; +import android.system.StructStat; import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; import java.util.ArrayList; import java.util.Enumeration; import java.util.List; -import libcore.io.ErrnoException; import libcore.io.Libcore; -import libcore.io.StructStat; /** * Manipulates DEX files. The class is similar in principle to diff --git a/dalvik/src/main/java/dalvik/system/DexPathList.java b/dalvik/src/main/java/dalvik/system/DexPathList.java index f3bee10..e364e40 100644 --- a/dalvik/src/main/java/dalvik/system/DexPathList.java +++ b/dalvik/src/main/java/dalvik/system/DexPathList.java @@ -16,6 +16,8 @@ package dalvik.system; +import android.system.ErrnoException; +import android.system.StructStat; import java.io.File; import java.io.IOException; import java.net.MalformedURLException; @@ -26,11 +28,9 @@ import java.util.Collections; import java.util.Enumeration; import java.util.List; import java.util.zip.ZipFile; -import libcore.io.ErrnoException; import libcore.io.IoUtils; import libcore.io.Libcore; -import libcore.io.StructStat; -import static libcore.io.OsConstants.*; +import static android.system.OsConstants.*; /** * A pair of lists of entries, associated with a {@code ClassLoader}. |