merge in klp-release history after reset to klp-dev

[android-x86/dalvik.git] / vm / ReconfigureDvm.mk

diff --git a/vm/ReconfigureDvm.mk b/vm/ReconfigureDvm.mk
index 3633e71..6e161c9 100644 (file)
--- a/vm/ReconfigureDvm.mk
+++ b/vm/ReconfigureDvm.mk
@@ -19,20 +19,16 @@ dvm_os := $(TARGET_OS)
 dvm_arch := $(TARGET_ARCH)
 dvm_arch_variant := $(TARGET_ARCH_VARIANT)
 
-# for now, disable x86-atom variant
-ifeq ($(dvm_arch_variant),x86-atom)
-dvm_arch_variant := x86
-endif
-
 include $(LOCAL_PATH)/Dvm.mk
 
-LOCAL_SHARED_LIBRARIES += liblog libcutils libnativehelper libz libdl libcorkscrew
-
-ifeq ($(HAVE_SELINUX),true)
-LOCAL_C_INCLUDES += external/libselinux/include
-LOCAL_SHARED_LIBRARIES += libselinux
-LOCAL_CFLAGS += -DHAVE_SELINUX
-endif # HAVE_SELINUX
+LOCAL_SHARED_LIBRARIES += \
+       libcorkscrew \
+       libcutils \
+       libdl \
+       liblog \
+       libnativehelper \
+       libselinux \
+       libz
 
 LOCAL_STATIC_LIBRARIES += libdex