diff options
| -rw-r--r-- | benchmarks/Android.mk | 3 | ||||
| -rw-r--r-- | tests/Android.build.mk | 5 | ||||
| -rw-r--r-- | tests/Android.mk | 2 |
3 files changed, 10 insertions, 0 deletions
diff --git a/benchmarks/Android.mk b/benchmarks/Android.mk index 797ce62..25e2ed9 100644 --- a/benchmarks/Android.mk +++ b/benchmarks/Android.mk @@ -44,6 +44,9 @@ benchmark_src_files = \ # adb shell bionic-benchmarks include $(CLEAR_VARS) LOCAL_MODULE := bionic-benchmarks +LOCAL_MODULE_STEM_32 := bionic-benchmarks32 +LOCAL_MODULE_STEM_64 := bionic-benchmarks64 +LOCAL_MULTILIB := both LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_CFLAGS += $(benchmark_c_flags) LOCAL_C_INCLUDES += external/stlport/stlport bionic/ bionic/libstdc++/include diff --git a/tests/Android.build.mk b/tests/Android.build.mk index 33e0a0b..5a53685 100644 --- a/tests/Android.build.mk +++ b/tests/Android.build.mk @@ -18,6 +18,11 @@ include $(CLEAR_VARS) LOCAL_MODULE := $(module) LOCAL_MODULE_TAGS := $(module_tag) +LOCAL_MULTILIB := $(multilib) +ifeq ($(multilib),both) + LOCAL_MODULE_STEM_32 := $(module)32 + LOCAL_MODULE_STEM_64 := $(module)64 +endif LOCAL_CLANG := $($(module)_clang_$(build_type)) diff --git a/tests/Android.mk b/tests/Android.mk index d2bcce8..daf9377 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -221,6 +221,7 @@ bionic-unit-tests_shared_libraries_target := \ module := bionic-unit-tests module_tag := optional +multilib := both build_type := target build_target := NATIVE_TEST include $(LOCAL_PATH)/Android.build.mk @@ -242,6 +243,7 @@ bionic-unit-tests-static_force_static_executable := true module := bionic-unit-tests-static module_tag := optional +multilib := both build_type := target build_target := NATIVE_TEST include $(LOCAL_PATH)/Android.build.mk |