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

Merge "Fix host build for arm/arm64"

Browse Source
This commit is contained in:
Dmitriy Ivanov
2014-11-14 20:19:37 +00:00
committed by Gerrit Code Review
parent 898aab282c 9df4b13baf
commit 27fa71ebc6
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tests/libs/Android.mk
View File

@@ -324,12 +324,17 @@ include $(LOCAL_PATH)/Android.build.testlib.mk
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# Library with DF_1_GLOBAL # Library with DF_1_GLOBAL
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# TODO: re-enable arm once b/18137520 or b/18130452 are fixed
ifeq ($(filter $(TARGET_ARCH),arm arm64),)
libdl_test_df_1_global_src_files := dl_df_1_global.cpp libdl_test_df_1_global_src_files := dl_df_1_global.cpp
libdl_test_df_1_global_ldflags := -fuse-ld=bfd -Wl,-z,global libdl_test_df_1_global_ldflags := -fuse-ld=bfd -Wl,-z,global
module := libdl_test_df_1_global module := libdl_test_df_1_global
# TODO: re-enable arm once b/18137520 or b/18130452 are fixed
ifeq ($(filter $(TARGET_ARCH),arm arm64),)
include $(LOCAL_PATH)/Android.build.testlib.mk include $(LOCAL_PATH)/Android.build.testlib.mk
else
# build it for host only
build_target := SHARED_LIBRARY
build_type := host
include $(TEST_PATH)/Android.build.mk
endif endif
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------