Remove -nodefaultlibs and -nostdinc++ndk-sysroot-r21

-nostdinc++ is already passed by the build system for stl: "none".
-nodefaultlibs was prevoiusly passed by the build system, but has
been replaced with -nostdlib++ to avoid having to manually pass
all the other default libraries on the command line.  Passing
-nodefaultlibs here causes libc++ to no longer link against libc.

Test: m checkbuild
Change-Id: Ib3392d545f68be594800fe806ecd365f830d201e

1 files changed, 0 insertions, 5 deletions

diff --git a/Android.bp b/Android.bp
index 9dccf0818..4839cb696 100644
--- a/Android.bp
+++ b/Android.bp
@@ -22,7 +22,6 @@ cc_defaults {
     cflags: ["-Wall", "-Werror", "-Wno-unused-parameter"],
     cppflags: [
         "-std=c++14",
-        "-nostdinc++",
         "-fexceptions",
         "-DLIBCXX_BUILDING_LIBCXXABI",
         "-D_LIBCPP_BUILDING_LIBRARY",
@@ -126,14 +125,10 @@ cc_library_shared {
             force_symbols_not_weak_list: "lib/notweak.exp",
             force_symbols_weak_list: "lib/weak.exp",
             ldflags: [
-                "-nodefaultlibs",
                 "-Wl,-undefined,dynamic_lookup",
             ],
         },
 
-        linux_glibc: {
-            ldflags: ["-nodefaultlibs"],
-        },
         linux_bionic: {
             enabled: true,
         },