diff options
| author | Jesse Wilson <jessewilson@google.com> | 2010-08-18 11:35:23 -0700 |
|---|---|---|
| committer | Jesse Wilson <jessewilson@google.com> | 2010-08-18 21:16:56 -0700 |
| commit | 3e9bfe0bed2f27d01efdb03a71025c421d321956 (patch) | |
| tree | d0a9074f4f7f5196ccc93d369b60babbe1bd21e7 /dexopt | |
| parent | 52d4cd28a5d6d946934704e11e1d41450c10aa05 (diff) | |
Support dalvikvm on a Linux x86 host
Change-Id: Id166ab03a01833e06ec1a9aa0059e4eb28ec04ce
Diffstat (limited to 'dexopt')
| -rw-r--r-- | dexopt/Android.mk | 33 |
1 files changed, 23 insertions, 10 deletions
diff --git a/dexopt/Android.mk b/dexopt/Android.mk index eb486c8cd..96ec3b268 100644 --- a/dexopt/Android.mk +++ b/dexopt/Android.mk @@ -17,30 +17,43 @@ # so it must be linked against the full VM shared library. # LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) -LOCAL_SRC_FILES := \ +local_src_files := \ OptMain.c -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 libutils libz LOCAL_MODULE := dexopt - 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 libutils libz + LOCAL_LDLIBS += -ldl -lpthread + LOCAL_CFLAGS += -DANDROID_SMP=1 + LOCAL_MODULE := dexopt + include $(BUILD_HOST_EXECUTABLE) +endif |