diff options
| author | Elliott Hughes <enh@google.com> | 2011-07-19 17:53:03 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2013-05-09 21:30:17 -0700 |
| commit | 7cad2d4e4e00bb152b726541b62840708d1cbcb1 (patch) | |
| tree | 40521353a3d3aeb0916865ab464874e6c54adb59 /dalvik | |
| parent | 7def64396da00e93a06e359497d6aaa781fe610f (diff) | |
| download | libcore-7cad2d4e4e00bb152b726541b62840708d1cbcb1.zip libcore-7cad2d4e4e00bb152b726541b62840708d1cbcb1.tar.gz libcore-7cad2d4e4e00bb152b726541b62840708d1cbcb1.tar.bz2 | |
Some of our helpers have moved into libnativehelpers.
(cherry picked from commit 4b5012a6cd5f7f32f33a776c9e2c94ca3f3eb1d5)
Change-Id: I8a154f8b6e39b8ed0a633fab9ba31d557b545bb5
Diffstat (limited to 'dalvik')
| -rw-r--r-- | dalvik/src/main/java/dalvik/system/DexFile.java | 6 | ||||
| -rw-r--r-- | dalvik/src/main/native/org_apache_harmony_dalvik_NativeTestTarget.cpp | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/dalvik/src/main/java/dalvik/system/DexFile.java b/dalvik/src/main/java/dalvik/system/DexFile.java index 8db3985..18b730b 100644 --- a/dalvik/src/main/java/dalvik/system/DexFile.java +++ b/dalvik/src/main/java/dalvik/system/DexFile.java @@ -273,12 +273,6 @@ public final class DexFile { int flags) throws IOException; /* - * Open a DEX file based on a {@code byte[]}. The value returned - * is a magic VM cookie. On failure, a RuntimeException is thrown. - */ - native private static int openDexFile(byte[] fileContents); - - /* * Close DEX file. */ native private static void closeDexFile(int cookie); diff --git a/dalvik/src/main/native/org_apache_harmony_dalvik_NativeTestTarget.cpp b/dalvik/src/main/native/org_apache_harmony_dalvik_NativeTestTarget.cpp index 11735eb..52f22a8 100644 --- a/dalvik/src/main/native/org_apache_harmony_dalvik_NativeTestTarget.cpp +++ b/dalvik/src/main/native/org_apache_harmony_dalvik_NativeTestTarget.cpp @@ -17,7 +17,7 @@ #define LOG_TAG "NativeTestTarget" #include "JNIHelp.h" -#include "../../../../luni/src/main/native/JniConstants.h" +#include "JniConstants.h" static void NativeTestTarget_emptyJniMethod0(JNIEnv*, jobject) { } static void NativeTestTarget_emptyJniMethod6(JNIEnv*, jclass, int, int, int, int, int, int) { } |