commit d49103b84a0dfe8a083d42a70b05a47c94a76bbb
author Dan Willemsen <dwillemsen@google.com> Tue Oct 17 03:44:53 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Oct 17 03:44:53 2017 +0000
tree 068a60327315830e71eab8878e0560b9031c54c2
parent 12f3b90ea6c978309ba2629000ff6fa00a19dff1
parent 0c378cfac7eb035359846addb26737f8c86a92e7

Merge "Use target.linux for all linux kernel based targets"
am: 0c378cfac7

Change-Id: Ia6bb07bf98c2ab590244d8f6de0cdfc1f33a1a80

Android.bp

diff --git a/Android.bp b/Android.bp
index 8881b2b..216013c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -29,15 +29,7 @@
         "-Werror=implicit-function-declaration",
     ],
     target: {
-        android: {
-            cflags: [
-                "-DTARGET_OS_LINUX",
-                "-DHAVE_LINUX",
-                "-DUSES_NETLINK",
-                "-Werror",
-            ],
-        },
-        linux_glibc: {
+        linux: {
             cflags: [
                 "-DTARGET_OS_LINUX",
                 "-DHAVE_LINUX",