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

am daf15a6c: resolved conflicts for merge of 8de1ddec to lmp-mr1-dev-plus-aosp

Browse Source 
* commit 'daf15a6ca7b1ef7f16103e339334eda3b18aa425':
  Fix order of soinfo links (repairs libcxx tests).
This commit is contained in:
Dmitriy Ivanov 2014-10-02 18:41:08 +00:00 committed by Android Git Automerger
commit a79c70dd59
1 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tests/libs/Android.mk
View File

@ -408,6 +408,29 @@ build_type := target
build_target := SHARED_LIBRARY build_target := SHARED_LIBRARY
include $(TEST_PATH)/Android.build.mk include $(TEST_PATH)/Android.build.mk
# -----------------------------------------------------------------------------
# libtest_relo_check_dt_needed_order.so
# |
# +-> libtest_relo_check_dt_needed_order_1.so
# |
# +-> libtest_relo_check_dt_needed_order_2.so
# -----------------------------------------------------------------------------
libtest_relo_check_dt_needed_order_shared_libraries := \
libtest_relo_check_dt_needed_order_1 libtest_relo_check_dt_needed_order_2
libtest_relo_check_dt_needed_order_src_files := dlopen_testlib_relo_check_dt_needed_order.cpp
libtest_relo_check_dt_needed_order_1_src_files := dlopen_testlib_relo_check_dt_needed_order_1.cpp
libtest_relo_check_dt_needed_order_2_src_files := dlopen_testlib_relo_check_dt_needed_order_2.cpp
build_type := target
build_target := SHARED_LIBRARY
module := libtest_relo_check_dt_needed_order
include $(TEST_PATH)/Android.build.mk
module := libtest_relo_check_dt_needed_order_1
include $(TEST_PATH)/Android.build.mk
module := libtest_relo_check_dt_needed_order_2
include $(TEST_PATH)/Android.build.mk
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# Library with dependency used by dlfcn tests # Library with dependency used by dlfcn tests
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------