From 6fcd7a7d28aa6be42bbc99070c93d4d16b56ab57 Mon Sep 17 00:00:00 2001
From: Alex Cheung <alexcheung@google.com>
Date: Tue, 31 Jan 2017 04:05:00 +0000
Subject: Revert "Fix CFI initialization crash on x86."

This reverts commit be46d3871c91902504e5ec4c7f575c86f647aafc.

Reverting due to broken build:

https://android-build.googleplex.com/builds/branch-dashboard/aosp-master?build_id=3687823

Change-Id: I30968398edd9a094fce878839ba0a002ed487a77
---
 tests/libs/Android.bp | 17 -----------------
 1 file changed, 17 deletions(-)

(limited to 'tests/libs/Android.bp')

diff --git a/tests/libs/Android.bp b/tests/libs/Android.bp
index 9f9c40724..b5855af62 100644
--- a/tests/libs/Android.bp
+++ b/tests/libs/Android.bp
@@ -494,20 +494,3 @@ cc_test_library {
         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}/.."],
-}
-- 
cgit v1.2.3