diff options
| author | Elliott Hughes <enh@google.com> | 2011-06-15 11:12:05 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2011-06-15 11:12:05 -0700 |
| commit | e6c0ef210ee6c62cf4c63d50c04f451d5fa505f5 (patch) | |
| tree | 240858c4cd500ae6cfaf9b8ae9207caedd297a50 /libnativehelper | |
| parent | 8c8d1594ae9c7b588bb990e7407f4baa6185ecb9 (diff) | |
| download | android_dalvik-e6c0ef210ee6c62cf4c63d50c04f451d5fa505f5.tar.gz android_dalvik-e6c0ef210ee6c62cf4c63d50c04f451d5fa505f5.tar.bz2 android_dalvik-e6c0ef210ee6c62cf4c63d50c04f451d5fa505f5.zip | |
Break a dependency on frameworks/base when building a host VM.
These aren't necessarily good abstractions, but they're no worse than what
we had, and having them factored out is a step in the right direction.
Change-Id: I5b839608317d2ca1ca54d8a38624fb686f2c37de
Diffstat (limited to 'libnativehelper')
| -rw-r--r-- | libnativehelper/Android.mk | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/libnativehelper/Android.mk b/libnativehelper/Android.mk index 3b0b6dcac..dea09078f 100644 --- a/libnativehelper/Android.mk +++ b/libnativehelper/Android.mk @@ -34,7 +34,6 @@ shared_libraries := \ libcrypto \ libicui18n \ libicuuc \ - libsqlite \ libssl static_libraries := \ @@ -52,7 +51,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(src_files) LOCAL_C_INCLUDES := $(c_includes) LOCAL_STATIC_LIBRARIES := $(static_libraries) -LOCAL_SHARED_LIBRARIES := $(shared_libraries) libcutils libexpat liblog libstlport libutils libz +LOCAL_SHARED_LIBRARIES := $(shared_libraries) libcutils libexpat liblog libstlport libz LOCAL_MODULE_TAGS := optional LOCAL_MODULE := libnativehelper @@ -74,11 +73,10 @@ ifeq ($(WITH_HOST_DALVIK),true) 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_WHOLE_STATIC_LIBRARIES += libutils + LOCAL_LDLIBS := -lexpat -lssl -lz -lcrypto -licucore else LOCAL_SHARED_LIBRARIES := $(shared_libraries) - LOCAL_STATIC_LIBRARIES := libcutils libexpat liblog libutils libz + LOCAL_STATIC_LIBRARIES := libcutils libexpat liblog libz endif LOCAL_MODULE_TAGS := optional |