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
diff --git a/Android.mk b/Android.mk
index 3b0b6dc..dea0907 100644
--- a/Android.mk
+++ b/Android.mk
@@ -34,7 +34,6 @@
libcrypto \
libicui18n \
libicuuc \
- libsqlite \
libssl
static_libraries := \
@@ -52,7 +51,7 @@
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 ($(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
