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

resolved conflicts for merge of 7d971ec1 to lmp-mr1-dev-plus-aosp

Browse Source 
Change-Id: I1cd01e5c0dd00cd55594654d53f7e0cb6edf35d9
This commit is contained in:
Dmitriy Ivanov
2014-10-02 12:38:54 -07:00
parent b5626827c9 7d971ec14b
commit feaf85e34c
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/libs/Android.mk
View File

@@ -348,7 +348,7 @@ include $(TEST_PATH)/Android.build.mk
# #
# libtest_with_dependency_loop -> a -> b -> c -> a # libtest_with_dependency_loop -> a -> b -> c -> a
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
libtest_with_dependency_loop_src_files := empty.cpp libtest_with_dependency_loop_src_files := dlopen_testlib_invalid.cpp
libtest_with_dependency_loop_shared_libraries := \ libtest_with_dependency_loop_shared_libraries := \
libtest_with_dependency_loop_a libtest_with_dependency_loop_a
@@ -361,7 +361,7 @@ include $(TEST_PATH)/Android.build.mk
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# libtest_with_dependency_loop_a.so # libtest_with_dependency_loop_a.so
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
libtest_with_dependency_loop_a_src_files := empty.cpp libtest_with_dependency_loop_a_src_files := dlopen_testlib_invalid.cpp
libtest_with_dependency_loop_a_shared_libraries := \ libtest_with_dependency_loop_a_shared_libraries := \
libtest_with_dependency_loop_b_tmp libtest_with_dependency_loop_b_tmp
@@ -376,7 +376,7 @@ include $(TEST_PATH)/Android.build.mk
# #
# this is temporary placeholder - will be removed # this is temporary placeholder - will be removed
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
libtest_with_dependency_loop_b_tmp_src_files := empty.cpp libtest_with_dependency_loop_b_tmp_src_files := dlopen_testlib_invalid.cpp
libtest_with_dependency_loop_b_tmp_ldflags := -Wl,-soname=libtest_with_dependency_loop_b.so libtest_with_dependency_loop_b_tmp_ldflags := -Wl,-soname=libtest_with_dependency_loop_b.so
module := libtest_with_dependency_loop_b_tmp module := libtest_with_dependency_loop_b_tmp
@@ -387,7 +387,7 @@ include $(TEST_PATH)/Android.build.mk
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# libtest_with_dependency_loop_b.so # libtest_with_dependency_loop_b.so
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
libtest_with_dependency_loop_b_src_files := empty.cpp libtest_with_dependency_loop_b_src_files := dlopen_testlib_invalid.cpp
libtest_with_dependency_loop_b_shared_libraries := libtest_with_dependency_loop_c libtest_with_dependency_loop_b_shared_libraries := libtest_with_dependency_loop_c
module := libtest_with_dependency_loop_b module := libtest_with_dependency_loop_b
@@ -398,7 +398,7 @@ include $(TEST_PATH)/Android.build.mk
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# libtest_with_dependency_loop_c.so # libtest_with_dependency_loop_c.so
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
libtest_with_dependency_loop_c_src_files := empty.cpp libtest_with_dependency_loop_c_src_files := dlopen_testlib_invalid.cpp
libtest_with_dependency_loop_c_shared_libraries := \ libtest_with_dependency_loop_c_shared_libraries := \
libtest_with_dependency_loop_a libtest_with_dependency_loop_a