Merge "Increase the default alloc tracker maximum."

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

diff --git a/dexopt/Android.mk b/dexopt/Android.mk
index 81fa1c8..60cb136 100644 (file)
--- a/dexopt/Android.mk
+++ b/dexopt/Android.mk
@@ -24,15 +24,7 @@ local_src_files := \
 local_c_includes := \
                dalvik \
                dalvik/libdex \
-               dalvik/vm \
-               $(JNI_H_INCLUDE)
-
-local_shared_libraries := \
-               libssl \
-               libdvm \
-               libcrypto \
-               libicuuc \
-               libicui18n
+               dalvik/vm
 
 include $(CLEAR_VARS)
 ifeq ($(TARGET_CPU_SMP),true)
@@ -43,7 +35,7 @@ endif
 
 LOCAL_SRC_FILES := $(local_src_files)
 LOCAL_C_INCLUDES := $(local_c_includes)
-LOCAL_SHARED_LIBRARIES := $(local_shared_libraries) libcutils libexpat liblog libz
+LOCAL_SHARED_LIBRARIES := libssl libdvm libcrypto libicuuc libicui18n libcutils libexpat liblog libz
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := dexopt
 
@@ -56,7 +48,7 @@ ifeq ($(WITH_HOST_DALVIK),true)
     include $(CLEAR_VARS)
     LOCAL_SRC_FILES := $(local_src_files)
     LOCAL_C_INCLUDES := $(local_c_includes)
-    LOCAL_SHARED_LIBRARIES := $(local_shared_libraries)
+    LOCAL_SHARED_LIBRARIES := libssl-host libdvm libcrypto-host libicuuc-host libicui18n-host
     LOCAL_STATIC_LIBRARIES :=  libcutils libexpat liblog libz
     LOCAL_LDLIBS += -ldl -lpthread
     LOCAL_CFLAGS += -DANDROID_SMP=1