diff options
| author | Christopher Ferris <cferris@google.com> | 2015-03-31 21:11:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-03-31 21:11:36 +0000 |
| commit | 9dc41d5d34c792e7a05e1ddfeea99c6cfc02fffd (patch) | |
| tree | b6aad0f8e40fc2a8a53196b027e18eefe9dd2ef8 /libbacktrace/Android.build.mk | |
| parent | 9c01c44bd6641f934afeece3c2ab2ab91e791dfc (diff) | |
| parent | 2c43cff01d1271be451671567955158629b23670 (diff) | |
| download | core-9dc41d5d34c792e7a05e1ddfeea99c6cfc02fffd.tar.gz core-9dc41d5d34c792e7a05e1ddfeea99c6cfc02fffd.tar.bz2 core-9dc41d5d34c792e7a05e1ddfeea99c6cfc02fffd.zip | |
Merge "Refactor the code."
Diffstat (limited to 'libbacktrace/Android.build.mk')
| -rw-r--r-- | libbacktrace/Android.build.mk | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/libbacktrace/Android.build.mk b/libbacktrace/Android.build.mk index ec3a71ba9..35fed6df5 100644 --- a/libbacktrace/Android.build.mk +++ b/libbacktrace/Android.build.mk @@ -19,13 +19,19 @@ include $(CLEAR_VARS) LOCAL_MODULE := $(module) LOCAL_MODULE_TAGS := $(module_tag) LOCAL_MULTILIB := $($(module)_multilib) +ifeq ($(LOCAL_MULTILIB),both) +ifneq ($(build_target),$(filter $(build_target),SHARED_LIBRARY STATIC_LIBRRARY)) + LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32 + LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64 +endif +endif LOCAL_ADDITIONAL_DEPENDENCIES := \ $(LOCAL_PATH)/Android.mk \ $(LOCAL_PATH)/Android.build.mk \ LOCAL_CFLAGS := \ - $(common_cflags) \ + $(libbacktrace_common_cflags) \ $($(module)_cflags) \ $($(module)_cflags_$(build_type)) \ @@ -33,17 +39,17 @@ LOCAL_CLANG_CFLAGS += \ $(libbacktrace_common_clang_cflags) \ LOCAL_CONLYFLAGS += \ - $(common_conlyflags) \ + $(libbacktrace_common_conlyflags) \ $($(module)_conlyflags) \ $($(module)_conlyflags_$(build_type)) \ LOCAL_CPPFLAGS += \ - $(common_cppflags) \ + $(libbacktrace_common_cppflags) \ $($(module)_cppflags) \ $($(module)_cppflags_$(build_type)) \ LOCAL_C_INCLUDES := \ - $(common_c_includes) \ + $(libbacktrace_common_c_includes) \ $($(module)_c_includes) \ $($(module)_c_includes_$(build_type)) \ |