diff options
| author | Narayan Kamath <narayan@google.com> | 2015-04-28 09:59:43 +0100 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2015-04-29 14:06:54 +0000 |
| commit | a9b386f30a903c42f460b71d97fc130178614052 (patch) | |
| tree | 9cc2d17a73724317f9542c576c787da998e9e660 /NativeCode.mk | |
| parent | 23fa44fd68f3660de802d6a608e9bafbd32994ad (diff) | |
| download | libcore-a9b386f30a903c42f460b71d97fc130178614052.zip libcore-a9b386f30a903c42f460b71d97fc130178614052.tar.gz libcore-a9b386f30a903c42f460b71d97fc130178614052.tar.bz2 | |
Add a static dependency on libbase.
Pulled in by the static libziparchive dependency.
Note that we can't add these dependencies in the sub-makefile
because libziparchive has different module names for target
vs host (libziparchve vs libziparchive-host).
Change-Id: Ie2e036f9e1bfd13d439501e2577651e42642c1bd
Diffstat (limited to 'NativeCode.mk')
| -rw-r--r-- | NativeCode.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/NativeCode.mk b/NativeCode.mk index 910527c..cfbaf9b 100644 --- a/NativeCode.mk +++ b/NativeCode.mk @@ -82,7 +82,7 @@ LOCAL_CPPFLAGS += $(core_cppflags) LOCAL_SRC_FILES += $(core_src_files) LOCAL_C_INCLUDES += $(core_c_includes) LOCAL_SHARED_LIBRARIES += $(core_shared_libraries) libcrypto libdl libexpat libicuuc libicui18n libnativehelper libz libutils -LOCAL_STATIC_LIBRARIES += $(core_static_libraries) libziparchive +LOCAL_STATIC_LIBRARIES += $(core_static_libraries) libziparchive libbase LOCAL_MODULE_TAGS := optional LOCAL_MODULE := libjavacore LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/NativeCode.mk @@ -158,7 +158,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE := libjavacore LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/NativeCode.mk LOCAL_SHARED_LIBRARIES += $(core_shared_libraries) libexpat-host libicuuc-host libicui18n-host libcrypto-host libz-host -LOCAL_STATIC_LIBRARIES += $(core_static_libraries) libziparchive-host libutils +LOCAL_STATIC_LIBRARIES += $(core_static_libraries) libutils libziparchive-host libbase LOCAL_MULTILIB := both LOCAL_CXX_STL := libc++ include $(BUILD_HOST_SHARED_LIBRARY) |