am c8d71801: resolved conflicts for merge of d0d351b2 to gingerbread-plus-aosp

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

diff --git a/libdex/Android.mk b/libdex/Android.mk
index af33baf..281801e 100644 (file)
--- a/libdex/Android.mk
+++ b/libdex/Android.mk
@@ -22,11 +22,11 @@ dex_src_files := \
        DexFile.c \
        DexInlines.c \
        DexOptData.c \
+       DexOpcodes.c \
        DexProto.c \
        DexSwapVerify.c \
        InstrUtils.c \
        Leb128.c \
-       OpCodeNames.c \
        OptInvocation.c \
        sha1.c \
        SysUtil.c \
@@ -46,8 +46,10 @@ dex_include_files := \
 ifneq ($(SDK_ONLY),true)  # SDK_only doesn't need device version
 
 include $(CLEAR_VARS)
+#LOCAL_CFLAGS += -UNDEBUG -DDEBUG=1
 LOCAL_SRC_FILES := $(dex_src_files)
 LOCAL_C_INCLUDES += $(dex_include_files)
+LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := libdex
 include $(BUILD_STATIC_LIBRARY)
 
@@ -62,5 +64,6 @@ endif # !SDK_ONLY
 include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(dex_src_files)
 LOCAL_C_INCLUDES += $(dex_include_files)
+LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := libdex
 include $(BUILD_HOST_STATIC_LIBRARY)