diff options
| author | Dan Bornstein <danfuzz@android.com> | 2009-10-24 13:23:37 -0700 |
|---|---|---|
| committer | Dan Bornstein <danfuzz@android.com> | 2009-10-24 13:23:37 -0700 |
| commit | bfbf10e910244aa5ac9df7a43b4722f113a34955 (patch) | |
| tree | cdf7c7446df11560cda360e89460a5286ffed6f0 /libnativehelper | |
| parent | 524fea166f6d2fabe516462a7aeedcdec3ad688b (diff) | |
| download | android_dalvik-bfbf10e910244aa5ac9df7a43b4722f113a34955.tar.gz android_dalvik-bfbf10e910244aa5ac9df7a43b4722f113a34955.tar.bz2 android_dalvik-bfbf10e910244aa5ac9df7a43b4722f113a34955.zip | |
Change the host build to include whole static libraries, and to name
them "*-host".
Change-Id: Ibf565c9c4b0709eb25edd71786b269895a1616a4
Diffstat (limited to 'libnativehelper')
| -rw-r--r-- | libnativehelper/Android.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libnativehelper/Android.mk b/libnativehelper/Android.mk index f030fea38..552f13914 100644 --- a/libnativehelper/Android.mk +++ b/libnativehelper/Android.mk @@ -77,13 +77,13 @@ ifeq ($(WITH_HOST_DALVIK),true) LOCAL_SRC_FILES := $(src_files) LOCAL_C_INCLUDES := $(c_includes) - LOCAL_STATIC_LIBRARIES := $(static_libraries) + LOCAL_WHOLE_STATIC_LIBRARIES := $(static_libraries:%=%-host) 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 + LOCAL_WHOLE_STATIC_LIBRARIES += libutils else LOCAL_SHARED_LIBRARIES := $(shared_libraries) endif |