commit be46d3871c91902504e5ec4c7f575c86f647aafc
author Evgenii Stepanov <eugenis@google.com> Fri Jan 27 13:42:03 2017 -0800
committer Evgenii Stepanov <eugenis@google.com> Mon Jan 30 14:29:48 2017 -0800
tree d202c0a4817459b1f6d5b971284b9afa2a9f795d
parent 6a9e0c8f15dee1b1b7c5cd7f8e058c2b18683bbc

Fix CFI initialization crash on x86.

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

tests/libs/Android.bp

diff --git a/tests/libs/Android.bp b/tests/libs/Android.bp
index b5855af..9f9c407 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: [" -Wl,-export-dynamic-symbol=__cfi_check"],
+}
+
+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}/.."],
+}