tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Remove $(module)_install_to_out_data flag from test makefile"

Browse source
This commit is contained in:
Treehugger Robot 2016-08-30 21:16:33 +00:00 committed by Gerrit Code Review
commit 6d7a1eec4c
3 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
tests/Android.build.mk
View file

@ -28,15 +28,7 @@ ifneq ($(findstring LIBRARY, $(build_target)),LIBRARY)
LOCAL_MODULE_STEM_32 := $(module)32
LOCAL_MODULE_STEM_64 := $(module)64
else
ifneq ($($(module)_install_to_out_data_dir),)
$(module)_install_to_out_data := true
endif
ifeq ($($(module)_install_to_out_data),true)
ifeq ($($(module)_install_to_out_data_dir),)
$(module)_install_to_out_data_dir := $(module)
endif
LOCAL_MODULE_PATH_32 := $($(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_DATA_NATIVE_TESTS)/$($(module)_install_to_out_data_dir)
LOCAL_MODULE_PATH_64 := $(TARGET_OUT_DATA_NATIVE_TESTS)/$($(module)_install_to_out_data_dir)
endif

6
tests/libs/Android.build.dt_runpath.mk
View file

@ -71,13 +71,15 @@ module := libtest_dt_runpath_d
include $(LOCAL_PATH)/Android.build.testlib.mk
# D version for open-from-zip test with runpath
module := libtest_dt_runpath_d_zip
libtest_dt_runpath_d_zip_src_files := \
dlopen_b.cpp
libtest_dt_runpath_d_zip_shared_libraries := libtest_dt_runpath_b libtest_dt_runpath_c
libtest_dt_runpath_d_zip_ldflags := -Wl,--rpath,\$${ORIGIN}/dt_runpath_b_c_x -Wl,--enable-new-dtags
libtest_dt_runpath_d_zip_install_to_out_data := true
module := libtest_dt_runpath_d_zip
libtest_dt_runpath_d_zip_install_to_out_data_dir := $(module)
module_tag := optional
build_type := target
build_target := SHARED_LIBRARY

15
tests/libs/Android.mk
View file

@ -70,13 +70,14 @@ $(HOST_OUT)/lib/libdlext_test.so: PRIVATE_POST_INSTALL_CMD = \
# -----------------------------------------------------------------------------
# Library used by dlext tests - different name non-default location
# -----------------------------------------------------------------------------
module := libdlext_test_fd
libdlext_test_fd_src_files := \
dlext_test_library.cpp \
libdlext_test_fd_shared_libraries := libtest_simple
libdlext_test_fd_install_to_out_data := true
module := libdlext_test_fd
libdlext_test_fd_install_to_out_data_dir := $(module)
module_tag := optional
build_type := target
build_target := SHARED_LIBRARY
@ -86,23 +87,25 @@ include $(TEST_PATH)/Android.build.mk
# -----------------------------------------------------------------------------
# Libraries used by dlext tests for open from a zip-file
# -----------------------------------------------------------------------------
module := libdlext_test_zip
libdlext_test_zip_src_files := \
dlext_test_library.cpp \
libdlext_test_zip_shared_libraries := libatest_simple_zip
libdlext_test_zip_install_to_out_data := true
module := libdlext_test_zip
libdlext_test_zip_install_to_out_data_dir := $(module)
module_tag := optional
build_type := target
build_target := SHARED_LIBRARY
include $(TEST_PATH)/Android.build.mk
module := libatest_simple_zip
libatest_simple_zip_src_files := \
dlopen_testlib_simple.cpp
libatest_simple_zip_install_to_out_data := true
module := libatest_simple_zip
libatest_simple_zip_install_to_out_data_dir := $(module)
module_tag := optional
build_type := target
build_target := SHARED_LIBRARY