Support wrapping app processes to inject debug instrumentation.

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

diff --git a/vm/Android.mk b/vm/Android.mk
index dd77dd4..3110639 100644 (file)
--- a/vm/Android.mk
+++ b/vm/Android.mk
@@ -32,10 +32,6 @@ LOCAL_PATH:= $(call my-dir)
 # Build for the target (device).
 #
 
-ifeq ($(TARGET_ARCH_VARIANT),armv5te)
-    WITH_JIT := false
-endif
-
 ifeq ($(TARGET_CPU_SMP),true)
     target_smp_flag := -DANDROID_SMP=1
 else
@@ -47,10 +43,12 @@ host_smp_flag := -DANDROID_SMP=1
 include $(LOCAL_PATH)/ReconfigureDvm.mk
 
 # Overwrite default settings
+ifneq ($(TARGET_ARCH),x86)
 ifeq ($(TARGET_SIMULATOR),false)
     LOCAL_PRELINK_MODULE := true
 endif
-LOCAL_MODULE_TAGS := user
+endif
+LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := libdvm
 LOCAL_CFLAGS += $(target_smp_flag)
 include $(BUILD_SHARED_LIBRARY)
@@ -107,15 +105,18 @@ ifeq ($(WITH_HOST_DALVIK),true)
 
     include $(LOCAL_PATH)/Dvm.mk
 
-    # We need to include all of these libraries. The end result of this
-    # section is a static library, but LOCAL_STATIC_LIBRARIES doesn't
-    # actually cause any code from the specified libraries to be included,
-    # whereas LOCAL_WHOLE_STATIC_LIBRARIES does. No, I (danfuzz) am not
-    # entirely sure what LOCAL_STATIC_LIBRARIES is even supposed to mean
-    # in this context, but it is in (apparently) meaningfully used in
-    # other parts of the build.
-    LOCAL_WHOLE_STATIC_LIBRARIES += \
-       libnativehelper-host libdex liblog libcutils
+    LOCAL_SHARED_LIBRARIES += libcrypto libssl libicuuc libicui18n
+
+    LOCAL_LDLIBS := -lpthread -ldl
+    ifeq ($(HOST_OS),linux)
+      # need this for clock_gettime() in profiling
+      LOCAL_LDLIBS += -lrt
+    endif
+
+    # Build as a WHOLE static library so dependencies are available at link
+    # time. When building this target as a regular static library, certain
+    # dependencies like expat are not found by the linker.
+    LOCAL_WHOLE_STATIC_LIBRARIES += libexpat libcutils libdex liblog libnativehelper libutils libz
 
     # The libffi from the source tree should never be used by host builds.
     # The recommendation is that host builds should always either
@@ -128,8 +129,9 @@ ifeq ($(WITH_HOST_DALVIK),true)
     endif
 
     LOCAL_CFLAGS += $(host_smp_flag)
-    LOCAL_MODULE := libdvm-host
+    LOCAL_MODULE_TAGS := optional
+    LOCAL_MODULE := libdvm
 
-    include $(BUILD_HOST_STATIC_LIBRARY)
+    include $(BUILD_HOST_SHARED_LIBRARY)
 
 endif