am 32ebc71f: resolved conflicts for merge of 59c12a65 to lmp-mr1-dev-plus-aosp
* commit '32ebc71f99523eb2496a4be175a40dcd10dc699a': Load libraries in breadth-first order
This commit is contained in:
commit
e027ca9665
@ -254,6 +254,160 @@ include $(LOCAL_PATH)/Android.build.testlib.mk
|
||||
module := libtest_relo_check_dt_needed_order_2
|
||||
include $(LOCAL_PATH)/Android.build.testlib.mk
|
||||
|
||||
# -----------------------------------------------------------------------------
|
||||
# Libraries used by dlfcn tests to verify correct load order:
|
||||
# libtest_check_order_2_right.so
|
||||
# -----------------------------------------------------------------------------
|
||||
libtest_check_order_2_right_src_files := \
|
||||
dlopen_testlib_answer.cpp
|
||||
|
||||
libtest_check_order_2_right_cflags := -D__ANSWER=42
|
||||
module := libtest_check_order_2_right
|
||||
build_type := target
|
||||
build_target := SHARED_LIBRARY
|
||||
include $(TEST_PATH)/Android.build.mk
|
||||
|
||||
# -----------------------------------------------------------------------------
|
||||
# libtest_check_order_a.so
|
||||
# -----------------------------------------------------------------------------
|
||||
libtest_check_order_a_src_files := \
|
||||
dlopen_testlib_answer.cpp
|
||||
|
||||
libtest_check_order_a_cflags := -D__ANSWER=1
|
||||
module := libtest_check_order_a
|
||||
build_type := target
|
||||
build_target := SHARED_LIBRARY
|
||||
include $(TEST_PATH)/Android.build.mk
|
||||
|
||||
# -----------------------------------------------------------------------------
|
||||
# libtest_check_order_b.so
|
||||
# -----------------------------------------------------------------------------
|
||||
libtest_check_order_b_src_files := \
|
||||
dlopen_testlib_answer.cpp
|
||||
|
||||
libtest_check_order_b_cflags := -D__ANSWER=2 -D__ANSWER2=43
|
||||
module := libtest_check_order_b
|
||||
build_type := target
|
||||
build_target := SHARED_LIBRARY
|
||||
include $(TEST_PATH)/Android.build.mk
|
||||
|
||||
# -----------------------------------------------------------------------------
|
||||
# libtest_check_order_c.so
|
||||
# -----------------------------------------------------------------------------
|
||||
libtest_check_order_3_c_src_files := \
|
||||
dlopen_testlib_answer.cpp
|
||||
|
||||
libtest_check_order_3_c_cflags := -D__ANSWER=3
|
||||
module := libtest_check_order_3_c
|
||||
build_type := target
|
||||
build_target := SHARED_LIBRARY
|
||||
include $(TEST_PATH)/Android.build.mk
|
||||
|
||||
# -----------------------------------------------------------------------------
|
||||
# libtest_check_order_d.so
|
||||
# -----------------------------------------------------------------------------
|
||||
libtest_check_order_d_src_files := \
|
||||
dlopen_testlib_answer.cpp
|
||||
|
||||
libtest_check_order_d_shared_libraries := libtest_check_order_b
|
||||
libtest_check_order_d_cflags := -D__ANSWER=4 -D__ANSWER2=4
|
||||
module := libtest_check_order_d
|
||||
build_type := target
|
||||
build_target := SHARED_LIBRARY
|
||||
include $(TEST_PATH)/Android.build.mk
|
||||
|
||||
# -----------------------------------------------------------------------------
|
||||
# libtest_check_order_left.so
|
||||
# -----------------------------------------------------------------------------
|
||||
libtest_check_order_1_left_src_files := \
|
||||
empty.cpp
|
||||
|
||||
libtest_check_order_1_left_shared_libraries := libtest_check_order_a libtest_check_order_b
|
||||
|
||||
module := libtest_check_order_1_left
|
||||
build_type := target
|
||||
build_target := SHARED_LIBRARY
|
||||
include $(TEST_PATH)/Android.build.mk
|
||||
|
||||
# -----------------------------------------------------------------------------
|
||||
# libtest_check_order.so
|
||||
# -----------------------------------------------------------------------------
|
||||
libtest_check_order_src_files := \
|
||||
empty.cpp
|
||||
|
||||
libtest_check_order_shared_libraries := libtest_check_order_1_left \
|
||||
libtest_check_order_2_right libtest_check_order_3_c
|
||||
|
||||
module := libtest_check_order
|
||||
build_type := target
|
||||
build_target := SHARED_LIBRARY
|
||||
include $(TEST_PATH)/Android.build.mk
|
||||
|
||||
# -----------------------------------------------------------------------------
|
||||
# Library with dependency loop used by dlfcn tests
|
||||
#
|
||||
# libtest_with_dependency_loop -> a -> b -> c -> a
|
||||
# -----------------------------------------------------------------------------
|
||||
libtest_with_dependency_loop_src_files := empty.cpp
|
||||
|
||||
libtest_with_dependency_loop_shared_libraries := \
|
||||
libtest_with_dependency_loop_a
|
||||
|
||||
module := libtest_with_dependency_loop
|
||||
build_type := target
|
||||
build_target := SHARED_LIBRARY
|
||||
include $(TEST_PATH)/Android.build.mk
|
||||
|
||||
# -----------------------------------------------------------------------------
|
||||
# libtest_with_dependency_loop_a.so
|
||||
# -----------------------------------------------------------------------------
|
||||
libtest_with_dependency_loop_a_src_files := empty.cpp
|
||||
|
||||
libtest_with_dependency_loop_a_shared_libraries := \
|
||||
libtest_with_dependency_loop_b_tmp
|
||||
|
||||
module := libtest_with_dependency_loop_a
|
||||
build_type := target
|
||||
build_target := SHARED_LIBRARY
|
||||
include $(TEST_PATH)/Android.build.mk
|
||||
|
||||
# -----------------------------------------------------------------------------
|
||||
# libtest_with_dependency_loop_b.so
|
||||
#
|
||||
# this is temporary placeholder - will be removed
|
||||
# -----------------------------------------------------------------------------
|
||||
libtest_with_dependency_loop_b_tmp_src_files := empty.cpp
|
||||
libtest_with_dependency_loop_b_tmp_ldflags := -Wl,-soname=libtest_with_dependency_loop_b.so
|
||||
|
||||
module := libtest_with_dependency_loop_b_tmp
|
||||
build_type := target
|
||||
build_target := SHARED_LIBRARY
|
||||
include $(TEST_PATH)/Android.build.mk
|
||||
|
||||
# -----------------------------------------------------------------------------
|
||||
# libtest_with_dependency_loop_b.so
|
||||
# -----------------------------------------------------------------------------
|
||||
libtest_with_dependency_loop_b_src_files := empty.cpp
|
||||
libtest_with_dependency_loop_b_shared_libraries := libtest_with_dependency_loop_c
|
||||
|
||||
module := libtest_with_dependency_loop_b
|
||||
build_type := target
|
||||
build_target := SHARED_LIBRARY
|
||||
include $(TEST_PATH)/Android.build.mk
|
||||
|
||||
# -----------------------------------------------------------------------------
|
||||
# libtest_with_dependency_loop_c.so
|
||||
# -----------------------------------------------------------------------------
|
||||
libtest_with_dependency_loop_c_src_files := empty.cpp
|
||||
|
||||
libtest_with_dependency_loop_c_shared_libraries := \
|
||||
libtest_with_dependency_loop_a
|
||||
|
||||
module := libtest_with_dependency_loop_c
|
||||
build_type := target
|
||||
build_target := SHARED_LIBRARY
|
||||
include $(TEST_PATH)/Android.build.mk
|
||||
|
||||
# -----------------------------------------------------------------------------
|
||||
# Library with dependency used by dlfcn tests
|
||||
# -----------------------------------------------------------------------------
|
||||
|
Loading…
x
Reference in New Issue
Block a user