diff options
| author | Ian Rogers <irogers@google.com> | 2014-06-05 22:38:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-06-05 22:38:15 +0000 |
| commit | 4ca26ce8ec3436727a92eb35d1698d2ae540faef (patch) | |
| tree | 6bcee695e7494794923a40e4a4b3373f47c77311 | |
| parent | e0115dd1302f6156879938dfb8bcc9ac5a43d7a6 (diff) | |
| parent | 59ec765382d800e84662f7b196b5bd053157b71a (diff) | |
| download | system_core-4ca26ce8ec3436727a92eb35d1698d2ae540faef.zip system_core-4ca26ce8ec3436727a92eb35d1698d2ae540faef.tar.gz system_core-4ca26ce8ec3436727a92eb35d1698d2ae540faef.tar.bz2 | |
Merge "Host multilib build of both 32-bit and 64-bit libraries."
| -rw-r--r-- | libcutils/Android.mk | 1 | ||||
| -rw-r--r-- | liblog/Android.mk | 2 | ||||
| -rw-r--r-- | libutils/Android.mk | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/libcutils/Android.mk b/libcutils/Android.mk index 20ad7ea..ca1fd15 100644 --- a/libcutils/Android.mk +++ b/libcutils/Android.mk @@ -81,6 +81,7 @@ LOCAL_CFLAGS += $(hostSmpFlag) ifneq ($(HOST_OS),windows) LOCAL_CFLAGS += -Werror endif +LOCAL_MULTILIB := both include $(BUILD_HOST_STATIC_LIBRARY) diff --git a/liblog/Android.mk b/liblog/Android.mk index 69ca416..a7eead9 100644 --- a/liblog/Android.mk +++ b/liblog/Android.mk @@ -58,6 +58,7 @@ endif LOCAL_MODULE := liblog LOCAL_SRC_FILES := $(liblog_host_sources) LOCAL_CFLAGS := -DFAKE_LOG_DEVICE=1 -Werror +LOCAL_MULTILIB := both include $(BUILD_HOST_STATIC_LIBRARY) include $(CLEAR_VARS) @@ -66,6 +67,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES := liblog ifeq ($(strip $(HOST_OS)),linux) LOCAL_LDLIBS := -lrt endif +LOCAL_MULTILIB := both include $(BUILD_HOST_SHARED_LIBRARY) diff --git a/libutils/Android.mk b/libutils/Android.mk index 3afc1ec..9a50147 100644 --- a/libutils/Android.mk +++ b/libutils/Android.mk @@ -69,6 +69,7 @@ endif LOCAL_MODULE:= libutils LOCAL_STATIC_LIBRARIES := liblog LOCAL_CFLAGS += $(host_commonCflags) +LOCAL_MULTILIB := both include $(BUILD_HOST_STATIC_LIBRARY) |