diff options
| author | Ian Rogers <irogers@google.com> | 2014-06-05 20:14:08 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-05 20:14:08 +0000 |
| commit | b42a7f82f0d5e6bec6d88cfb136efc5cbff578ae (patch) | |
| tree | 28a21e555332c9c8e3df97ee4f94824293f289f6 | |
| parent | f0fa5c23aac1a635f8523bc6849f33e8a3ef494c (diff) | |
| parent | 7420ca57ff30fad487f2a0111c5cb2a7d7d1ea3c (diff) | |
| download | compiler-rt-b42a7f82f0d5e6bec6d88cfb136efc5cbff578ae.tar.gz | |
am 7420ca57: Merge "Build host with multilib both enabled."
* commit '7420ca57ff30fad487f2a0111c5cb2a7d7d1ea3c':
Build host with multilib both enabled.
| -rw-r--r-- | Android.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk index bf79e5b27..0f4ece144 100644 --- a/Android.mk +++ b/Android.mk @@ -340,6 +340,7 @@ LOCAL_ASFLAGS := -integrated-as LOCAL_CLANG := true LOCAL_SRC_FILES := $(call get-libcompiler-rt-source-files,x86_64) LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk +LOCAL_MULTILIB := both include $(BUILD_HOST_STATIC_LIBRARY) @@ -382,6 +383,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES := libcompiler_rt LOCAL_CPPFLAGS := -nostdinc++ LOCAL_LDFLAGS := -nodefaultlibs LOCAL_LDLIBS := -lc -lm +LOCAL_MULTILIB := both include $(BUILD_HOST_SHARED_LIBRARY) |