diff options
| author | Christopher Ferris <cferris@google.com> | 2014-04-29 15:56:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-04-29 15:56:06 +0000 |
| commit | 7fdab460a9790959ce6c4201476a3ea982eb148e (patch) | |
| tree | 6146acf1d9f5fefd5773db0fea9a077465dc8afe | |
| parent | 07bab525e24725aaacd71e7cc63dfc31d48ba8a7 (diff) | |
| parent | 5090964da02c956f099a49b5a3eb732c0085c58b (diff) | |
| download | bionic-7fdab460a9790959ce6c4201476a3ea982eb148e.zip bionic-7fdab460a9790959ce6c4201476a3ea982eb148e.tar.gz bionic-7fdab460a9790959ce6c4201476a3ea982eb148e.tar.bz2 | |
Merge "Fix potential makefile bug."
| -rw-r--r-- | tests/Android.build.mk | 4 | ||||
| -rw-r--r-- | tests/Android.mk | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/Android.build.mk b/tests/Android.build.mk index 5a53685..c1a0f16 100644 --- a/tests/Android.build.mk +++ b/tests/Android.build.mk @@ -18,8 +18,8 @@ include $(CLEAR_VARS) LOCAL_MODULE := $(module) LOCAL_MODULE_TAGS := $(module_tag) -LOCAL_MULTILIB := $(multilib) -ifeq ($(multilib),both) +LOCAL_MULTILIB := $($(module)_multilib) +ifeq ($(LOCAL_MULTILIB),both) LOCAL_MODULE_STEM_32 := $(module)32 LOCAL_MODULE_STEM_64 := $(module)64 endif diff --git a/tests/Android.mk b/tests/Android.mk index 0014af6..d85e8eb 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -221,7 +221,7 @@ bionic-unit-tests_shared_libraries_target := \ module := bionic-unit-tests module_tag := optional -multilib := both +bionic-unit-tests_multilib := both build_type := target build_target := NATIVE_TEST include $(LOCAL_PATH)/Android.build.mk @@ -243,7 +243,7 @@ bionic-unit-tests-static_force_static_executable := true module := bionic-unit-tests-static module_tag := optional -multilib := both +bionic-unit-tests-static_multilib := both build_type := target build_target := NATIVE_TEST include $(LOCAL_PATH)/Android.build.mk |