aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@google.com>2017-10-03 14:16:21 -0700
committerDan Willemsen <dwillemsen@google.com>2017-10-16 14:08:33 -0700
commit84716218975c0c565ad17b3c0fd866aad7a6ccb2 (patch)
tree8ffef86d38120713b080d37a809ec9f78c1fc0cb
parent15c76ed42c7a51f8b42bd7faf0b56f29c21fc1dd (diff)
downloadlibusb-84716218975c0c565ad17b3c0fd866aad7a6ccb2.tar.gz
Use target.linux for all linux kernel based targets
Now in Android.bp files, target.linux applies to all targets running a linux kernel (android, linux_glibc, linux_bionic). So common flags/sources/etc can be combined instead of copying them to each target. Test: m Change-Id: If914367757f3d091f74e9dc11034b8a1180aa113
-rw-r--r--Android.bp11
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",
],