Merge "Use target.linux for all linux kernel based targets" am: a628a5956c am: 8008b1867c am: cd089e7cc7

am: ddbf95f204

Change-Id: I8f96cb315e0dd5b3f38cc3df776d27401776780d

1 files changed, 3 insertions, 8 deletions

diff --git a/Android.bp b/Android.bp
index 7d2ea31..f19d333 100644
--- a/Android.bp
+++ b/Android.bp
@@ -23,14 +23,16 @@ cc_library {
     ],
 
     target: {
-        android: {
+        linux: {
             srcs: [
                 "libusb/os/linux_usbfs.c",
                 "libusb/os/poll_posix.c",
                 "libusb/os/threads_posix.c",
                 "libusb/os/linux_netlink.c",
             ],
+        },
 
+        android: {
             local_include_dirs: [
                 "android",
             ],
@@ -59,13 +61,6 @@ cc_library {
         },
 
         linux_glibc: {
-            srcs: [
-                "libusb/os/linux_usbfs.c",
-                "libusb/os/poll_posix.c",
-                "libusb/os/threads_posix.c",
-                "libusb/os/linux_netlink.c",
-            ],
-
             local_include_dirs: [
                 "linux",
             ],