diff options
| author | Ian Rogers <irogers@google.com> | 2014-06-05 10:35:29 -0700 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2014-06-05 11:07:57 -0700 |
| commit | af7a29756b048becfe52d44032f1b7b033407d3d (patch) | |
| tree | b803794a25b5e67a43f580dd39f9edbecb0750bb | |
| parent | b8c41be3236bd92c11b505ab78f4be194539125b (diff) | |
| download | libunwind-af7a29756b048becfe52d44032f1b7b033407d3d.tar.gz | |
Build libunwind with host multilib support.
Change-Id: Ic30de0c7dda367b6d0067c0cfe1a74ae27eeecb5
| -rw-r--r-- | Android.build.mk | 2 | ||||
| -rw-r--r-- | Android.mk | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/Android.build.mk b/Android.build.mk index 18a324fe..3254be60 100644 --- a/Android.build.mk +++ b/Android.build.mk @@ -19,10 +19,12 @@ include $(CLEAR_VARS) LOCAL_MODULE := $(module) LOCAL_MODULE_TAGS := $(module_tag) LOCAL_MULTILIB := $($(module)_multilib) +ifeq ($(build_type),target) ifeq ($(LOCAL_MULTILIB),both) LOCAL_MODULE_STEM_32 := $(module)32 LOCAL_MODULE_STEM_64 := $(module)64 endif +endif LOCAL_ADDITIONAL_DEPENDENCIES := \ $(LOCAL_PATH)/Android.mk \ @@ -235,13 +235,17 @@ build_type := target build_target := SHARED_LIBRARY include $(LOCAL_PATH)/Android.build.mk build_type := host +libunwind_multilib := both include $(LOCAL_PATH)/Android.build.mk +libunwind_multilib := build_type := target build_target := STATIC_LIBRARY include $(LOCAL_PATH)/Android.build.mk build_type := host +libunwind_multilib := both include $(LOCAL_PATH)/Android.build.mk +libunwind_multilib := #----------------------------------------------------------------------- # libunwind-ptrace shared library |