Merge "Build 32/64 bit versions of tests/benchmarks."
This commit is contained in:
commit
8eaeaf50cb
@ -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
|
||||
|
@ -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))
|
||||
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user