am 13aeac96: Merge "Fix broken card table asserts."

[android-x86/dalvik.git] / dexlist / Android.mk

diff --git a/dexlist/Android.mk b/dexlist/Android.mk
index a7dd6e2..62b0087 100644 (file)
--- a/dexlist/Android.mk
+++ b/dexlist/Android.mk
@@ -21,16 +21,13 @@ dexdump_src_files := \
                DexList.cpp
 
 dexdump_c_includes := \
-               dalvik \
-               $(JNI_H_INCLUDE)
+               dalvik
 
 dexdump_shared_libraries :=
 
 dexdump_static_libraries := \
                libdex
 
-ifneq ($(TARGET_SIMULATOR),true) # not 64 bit clean
-
 include $(CLEAR_VARS)
 LOCAL_MODULE := dexlist
 LOCAL_MODULE_TAGS := optional
@@ -47,8 +44,6 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES := $(dexdump_src_files)
 LOCAL_C_INCLUDES := $(dexdump_c_includes)
 LOCAL_SHARED_LIBRARIES := $(dexdump_shared_libraries)
-LOCAL_STATIC_LIBRARIES := $(dexdump_static_libraries) libcutils
+LOCAL_STATIC_LIBRARIES := $(dexdump_static_libraries) libcutils liblog
 LOCAL_LDLIBS += -lpthread -lz
 include $(BUILD_HOST_EXECUTABLE)
-
-endif # TARGET_SIMULATOR