Android: separate the (host) linux and mac configs.

We need to build a few more tools for linux that we're never likely to
be able to build for mac (because there's no API for ps-like stuff).

Bug: http://b/139450866
Test: builds
Change-Id: I781fa5684e125d539bc0dacc41a27360d3763f73

1 files changed, 8 insertions, 4 deletions

diff --git a/Android.bp b/Android.bp
index 72d9d8dc..dd6276fd 100644
--- a/Android.bp
+++ b/Android.bp
@@ -140,6 +140,7 @@ cc_defaults {
         "-Wno-sign-compare",
         "-Wno-string-plus-int",
         "-Wno-unused-parameter",
+        "-Wno-unused-variable",
         "-funsigned-char",
         "-ffunction-sections",
         "-fdata-sections",
@@ -157,12 +158,12 @@ cc_defaults {
     ],
 
     target: {
-        host: {
-           local_include_dirs: ["android/host"],
-           cflags: ["-Wno-unused-variable"],
+        linux_glibc: {
+            local_include_dirs: ["android/linux"],
         },
 
         darwin: {
+            local_include_dirs: ["android/mac"],
             cflags: [
                 // You can't have toybox cp(1) on macOS before 10.13.
                 "-mmacosx-version-min=10.13",
@@ -176,6 +177,10 @@ cc_defaults {
             ],
         },
 
+        linux: {
+            srcs: ["toys/posix/ps.c"],
+        },
+
         android: {
             local_include_dirs: ["android/device"],
             srcs: [
@@ -274,7 +279,6 @@ cc_defaults {
                 "toys/posix/nl.c",
                 "toys/posix/nohup.c",
                 "toys/posix/printf.c",
-                "toys/posix/ps.c",
                 "toys/posix/renice.c",
                 "toys/posix/split.c",
                 "toys/posix/strings.c",