Reconcile with ics-mr1-release

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

diff --git a/dexopt/Android.mk b/dexopt/Android.mk
index eb486c8..d4831d1 100644 (file)
--- a/dexopt/Android.mk
+++ b/dexopt/Android.mk
@@ -17,30 +17,50 @@
 # so it must be linked against the full VM shared library.
 #
 LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
 
-LOCAL_SRC_FILES := \
-               OptMain.c
+local_src_files := \
+               OptMain.cpp
 
-LOCAL_C_INCLUDES := \
+local_c_includes := \
                dalvik \
                dalvik/libdex \
                dalvik/vm \
                $(JNI_H_INCLUDE)
 
-LOCAL_SHARED_LIBRARIES := \
-               libcutils \
-               liblog \
-               libz \
+local_shared_libraries := \
                libssl \
-               libdvm
+               libdvm \
+               libcrypto \
+               libicuuc \
+               libicui18n
 
+include $(CLEAR_VARS)
 ifeq ($(TARGET_CPU_SMP),true)
     LOCAL_CFLAGS += -DANDROID_SMP=1
 else
     LOCAL_CFLAGS += -DANDROID_SMP=0
 endif
 
+LOCAL_SRC_FILES := $(local_src_files)
+LOCAL_C_INCLUDES := $(local_c_includes)
+LOCAL_SHARED_LIBRARIES := $(local_shared_libraries) libcutils libexpat liblog libnativehelper libz
+LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := dexopt
 
+LOCAL_C_INCLUDES += external/stlport/stlport bionic/ bionic/libstdc++/include
+LOCAL_SHARED_LIBRARIES += libstlport
+
 include $(BUILD_EXECUTABLE)
+
+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_STATIC_LIBRARIES :=  libcutils libexpat liblog libnativehelper libz
+    LOCAL_LDLIBS += -ldl -lpthread
+    LOCAL_CFLAGS += -DANDROID_SMP=1
+    LOCAL_MODULE_TAGS := optional
+    LOCAL_MODULE := dexopt
+    include $(BUILD_HOST_EXECUTABLE)
+endif