From 3fef96f827bb4aebed08e48a1a760e0280029efd Mon Sep 17 00:00:00 2001 From: Dmitriy Ivanov Date: Mon, 20 Jul 2015 10:47:49 -0700 Subject: [PATCH] Fix dt_runpath test. Bfd linker produces DT_RPATH instead of DT_RUNPATH unless --enable-new-dtags option is specified. Bug: http://b/22560945 Change-Id: I71bdc5137b899ab736e55c5a9574cfbba8e1983b --- tests/libs/Android.build.dt_runpath.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/libs/Android.build.dt_runpath.mk b/tests/libs/Android.build.dt_runpath.mk index e9b5265af..44c8125bb 100644 --- a/tests/libs/Android.build.dt_runpath.mk +++ b/tests/libs/Android.build.dt_runpath.mk @@ -31,7 +31,7 @@ libtest_dt_runpath_b_src_files := \ empty.cpp libtest_dt_runpath_b_shared_libraries := libtest_dt_runpath_a -libtest_dt_runpath_b_ldflags := -Wl,--rpath,\$${ORIGIN}/../dt_runpath_a +libtest_dt_runpath_b_ldflags := -Wl,--rpath,\$${ORIGIN}/../dt_runpath_a -Wl,--enable-new-dtags libtest_dt_runpath_b_relative_path := dt_runpath_b_c_x module := libtest_dt_runpath_b include $(LOCAL_PATH)/Android.build.testlib.mk @@ -43,7 +43,7 @@ libtest_dt_runpath_c_src_files := \ empty.cpp libtest_dt_runpath_c_shared_libraries := libtest_dt_runpath_a -libtest_dt_runpath_c_ldflags := -Wl,--rpath,\$${ORIGIN}/invalid_dt_runpath +libtest_dt_runpath_c_ldflags := -Wl,--rpath,\$${ORIGIN}/invalid_dt_runpath -Wl,--enable-new-dtags libtest_dt_runpath_c_relative_path := dt_runpath_b_c_x module := libtest_dt_runpath_c include $(LOCAL_PATH)/Android.build.testlib.mk @@ -53,7 +53,7 @@ libtest_dt_runpath_d_src_files := \ dlopen_b.cpp libtest_dt_runpath_d_shared_libraries := libtest_dt_runpath_b libtest_dt_runpath_c -libtest_dt_runpath_d_ldflags := -Wl,--rpath,\$${ORIGIN}/dt_runpath_b_c_x +libtest_dt_runpath_d_ldflags := -Wl,--rpath,\$${ORIGIN}/dt_runpath_b_c_x -Wl,--enable-new-dtags module := libtest_dt_runpath_d include $(LOCAL_PATH)/Android.build.testlib.mk