summaryrefslogtreecommitdiffstats
path: root/dexlist
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2008-12-17 18:03:55 -0800
committerThe Android Open Source Project <initial-contribution@android.com>2008-12-17 18:03:55 -0800
commit89c1feb0a69a7707b271086e749975b3f7acacf7 (patch)
tree003624a03635e05020a47fc72a2c42934e3f0703 /dexlist
parent2ad60cfc28e14ee8f0bb038720836a4696c478ad (diff)
downloadandroid_dalvik-89c1feb0a69a7707b271086e749975b3f7acacf7.tar.gz
android_dalvik-89c1feb0a69a7707b271086e749975b3f7acacf7.tar.bz2
android_dalvik-89c1feb0a69a7707b271086e749975b3f7acacf7.zip
Code drop from //branches/cupcake/...@124589
Diffstat (limited to 'dexlist')
-rw-r--r--dexlist/Android.mk3
-rw-r--r--dexlist/DexList.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/dexlist/Android.mk b/dexlist/Android.mk
index e029702f1..27b6a5905 100644
--- a/dexlist/Android.mk
+++ b/dexlist/Android.mk
@@ -29,6 +29,8 @@ dexdump_shared_libraries :=
dexdump_static_libraries := \
libdex
+ifneq ($(TARGET_SIMULATOR),true) # not 64 bit clean
+
include $(CLEAR_VARS)
LOCAL_MODULE := dexlist
LOCAL_SRC_FILES := $(dexdump_src_files)
@@ -47,3 +49,4 @@ LOCAL_STATIC_LIBRARIES := $(dexdump_static_libraries) libcutils
LOCAL_LDLIBS += -lpthread -lz
include $(BUILD_HOST_EXECUTABLE)
+endif # TARGET_SIMULATOR
diff --git a/dexlist/DexList.c b/dexlist/DexList.c
index 24e5b9b5f..9cf296c33 100644
--- a/dexlist/DexList.c
+++ b/dexlist/DexList.c
@@ -197,7 +197,7 @@ int process(const char* fileName)
}
mapped = true;
- pDexFile = dexFileParse(map.addr, map.length);
+ pDexFile = dexFileParse(map.addr, map.length, kDexParseDefault);
if (pDexFile == NULL) {
fprintf(stderr, "Warning: DEX parse failed for '%s'\n", fileName);
goto bail;