diff options
| author | Dan Bornstein <danfuzz@android.com> | 2009-08-24 17:50:34 -0700 |
|---|---|---|
| committer | Dan Bornstein <danfuzz@android.com> | 2009-08-26 17:19:09 -0700 |
| commit | 93194e943d11e30ec459c514c824e0db7b20a438 (patch) | |
| tree | 789f02d962276fd38153ae75a442eee5bbbb758d /libnativehelper | |
| parent | 06566d20700820a62c8793858e359ed643ab7b1e (diff) | |
| download | android_dalvik-93194e943d11e30ec459c514c824e0db7b20a438.tar.gz android_dalvik-93194e943d11e30ec459c514c824e0db7b20a438.tar.bz2 android_dalvik-93194e943d11e30ec459c514c824e0db7b20a438.zip | |
More work on getting Dalvik to build on the host (particularly OSX).
The dalvikvm executable still doesn't quite build (fails in linker), which
is probably due to the core library native code not getting compiled and
linked. Unfortunately, it looks like that will be pretty hairy to untangle.
Change-Id: Ib5de623e43a40116c4b7459a45a246d76886edf3
Diffstat (limited to 'libnativehelper')
| -rw-r--r-- | libnativehelper/Android.mk | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/libnativehelper/Android.mk b/libnativehelper/Android.mk index aa4be86bd..f030fea38 100644 --- a/libnativehelper/Android.mk +++ b/libnativehelper/Android.mk @@ -55,8 +55,8 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(src_files) LOCAL_C_INCLUDES := $(c_includes) -LOCAL_SHARED_LIBRARIES := $(shared_libraries) LOCAL_STATIC_LIBRARIES := $(static_libraries) +LOCAL_SHARED_LIBRARIES := $(shared_libraries) # liblog and libcutils are shared for target. LOCAL_SHARED_LIBRARIES += \ @@ -77,15 +77,23 @@ ifeq ($(WITH_HOST_DALVIK),true) LOCAL_SRC_FILES := $(src_files) LOCAL_C_INCLUDES := $(c_includes) - LOCAL_SHARED_LIBRARIES := $(shared_libraries) LOCAL_STATIC_LIBRARIES := $(static_libraries) + ifeq ($(HOST_OS)-$(HOST_ARCH),darwin-x86) + # OSX has a lot of libraries built in, which we don't have to + # bother building; just include them on the ld line. + LOCAL_LDLIBS := -lexpat -lssl -lz -lcrypto -licucore -lsqlite3 + LOCAL_STATIC_LIBRARIES += libutils + else + LOCAL_SHARED_LIBRARIES := $(shared_libraries) + endif + # liblog and libcutils are static for host. LOCAL_STATIC_LIBRARIES += \ liblog libcutils LOCAL_MODULE := libnativehelper-host - include $(BUILD_HOST_SHARED_LIBRARY) + include $(BUILD_HOST_STATIC_LIBRARY) endif |