commit 68ecec1965dcec08c7df3f0224d69604c683cd6c
author Evgenii Stepanov <eugenis@google.com> Tue Jan 31 13:19:30 2017 -0800
committer Evgenii Stepanov <eugenis@google.com> Thu Feb 02 14:44:46 2017 -0800
tree 13d1842c2a6d22a8818f9d24d4f49273cfda5e3c
parent 3c838bbb4aca12936aa3d8e96f3b04af3803d0f4

Fix CFI initialization crash on x86.

Third try.

Bug: 34752378
Test: bionic tests
Change-Id: I247c127489a8ee38404e104f28d916a704e35f36

tests/libs/Android.bp

diff --git a/tests/libs/Android.bp b/tests/libs/Android.bp
index b5855af..7802727 100644
--- a/tests/libs/Android.bp
+++ b/tests/libs/Android.bp
@@ -494,3 +494,20 @@
         cfi: false,
     },
 }
+
+cc_test {
+    name: "cfi_test_helper",
+    host_supported: false,
+    defaults: ["bionic_testlib_defaults"],
+    srcs: ["cfi_test_helper.cpp"],
+    ldflags: ["-rdynamic"],
+}
+
+cc_test {
+    name: "cfi_test_helper2",
+    host_supported: false,
+    defaults: ["bionic_testlib_defaults"],
+    srcs: ["cfi_test_helper2.cpp"],
+    shared_libs: ["libcfi-test"],
+    ldflags: ["-Wl,--rpath,${ORIGIN}/.."],
+}