commit 2ca556bb6e23f33dcbce4f464692c580f7fba07d
author Treehugger Robot <treehugger-gerrit@google.com> Fri Jan 27 03:03:50 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jan 27 03:03:50 2017 +0000
tree 3979e9c745c50f38b2087879c0c0b5ea3b903ea4
parent 55aae03a60210374deb62a173703a8d5ea5f81be
parent 451909da3159acc34a136262efdc80ae44bacb62

Merge "Remove dependency on libc.a from the linker"

tests/Android.bp

diff --git a/tests/Android.bp b/tests/Android.bp
index 64a5c30..2ccdbf8 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -179,32 +179,6 @@
 }
 
 cc_test_library {
-    name: "libfortify1-tests-gcc",
-    defaults: ["bionic_fortify_tests_defaults", "bionic_tests_defaults"],
-    clang: false,
-    cflags: [
-        "-D_FORTIFY_SOURCE=1",
-        "-DTEST_NAME=Fortify1_gcc"
-    ],
-    shared: {
-        enabled: false,
-    },
-}
-
-cc_test_library {
-    name: "libfortify2-tests-gcc",
-    defaults: ["bionic_fortify_tests_defaults", "bionic_tests_defaults"],
-    clang: false,
-    cflags: [
-        "-D_FORTIFY_SOURCE=2",
-        "-DTEST_NAME=Fortify2_gcc"
-    ],
-    shared: {
-        enabled: false,
-    },
-}
-
-cc_test_library {
     name: "libfortify1-tests-clang",
     defaults: ["bionic_fortify_tests_defaults", "bionic_tests_defaults"],
     clang: true,
@@ -238,8 +212,6 @@
     defaults: ["bionic_tests_defaults"],
     whole_static_libs: [
         "libBionicStandardTests",
-        "libfortify1-tests-gcc",
-        "libfortify2-tests-gcc",
         "libfortify1-tests-clang",
         "libfortify2-tests-clang",
     ],
@@ -412,12 +384,6 @@
     },
 }
 
-cc_test {
-    name: "bionic-unit-tests-gcc",
-    defaults: ["bionic_unit_tests_defaults", "bionic_tests_defaults"],
-    clang: false,
-}
-
 // -----------------------------------------------------------------------------
 // Tests for the device linked against bionic's static library. Run with:
 //   adb shell /data/nativetest/bionic-unit-tests-static/bionic-unit-tests-static32
@@ -484,8 +450,6 @@
     whole_static_libs: [
         "libBionicStandardTests",
         "libBionicGtestMain",
-        "libfortify1-tests-gcc",
-        "libfortify2-tests-gcc",
         "libfortify1-tests-clang",
         "libfortify2-tests-clang",
     ],