generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 8eaeaf50: Merge "Build 32/64 bit versions of tests/benchmarks."

Browse Source 
* commit '8eaeaf50cbd769c7c9852621a422a4f0be1e08e5':
  Build 32/64 bit versions of tests/benchmarks.
This commit is contained in:
Christopher Ferris 2014-04-22 21:36:40 +00:00 committed by Android Git Automerger
commit caba4e9b89
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
benchmarks/Android.mk
View File

@ -44,6 +44,9 @@ benchmark_src_files = \
# adb shell bionic-benchmarks # adb shell bionic-benchmarks
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := bionic-benchmarks 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_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_CFLAGS += $(benchmark_c_flags) LOCAL_CFLAGS += $(benchmark_c_flags)
LOCAL_C_INCLUDES += external/stlport/stlport bionic/ bionic/libstdc++/include LOCAL_C_INCLUDES += external/stlport/stlport bionic/ bionic/libstdc++/include

5
tests/Android.build.mk
View File

@ -18,6 +18,11 @@ include $(CLEAR_VARS)
LOCAL_MODULE := $(module) LOCAL_MODULE := $(module)
LOCAL_MODULE_TAGS := $(module_tag) 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)) LOCAL_CLANG := $($(module)_clang_$(build_type))

2
tests/Android.mk
View File

@ -221,6 +221,7 @@ bionic-unit-tests_shared_libraries_target := \
module := bionic-unit-tests module := bionic-unit-tests
module_tag := optional module_tag := optional
multilib := both
build_type := target build_type := target
build_target := NATIVE_TEST build_target := NATIVE_TEST
include $(LOCAL_PATH)/Android.build.mk include $(LOCAL_PATH)/Android.build.mk
@ -242,6 +243,7 @@ bionic-unit-tests-static_force_static_executable := true
module := bionic-unit-tests-static module := bionic-unit-tests-static
module_tag := optional module_tag := optional
multilib := both
build_type := target build_type := target
build_target := NATIVE_TEST build_target := NATIVE_TEST
include $(LOCAL_PATH)/Android.build.mk include $(LOCAL_PATH)/Android.build.mk