aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaciej Żenczykowski <maze@google.com>2023-10-23 12:20:24 -0700
committerMaciej Żenczykowski <maze@google.com>2023-10-25 15:50:52 -0700
commit5325bb91d567c0baa5e1be86e2bcf264f037eecc (patch)
tree2ba7371f333cff71a75a01a9ba4fe6f9090fb908
parent03c9e310b47fb9c56fdc517ccfab7363dc92ae9c (diff)
downloadethtool-5325bb91d567c0baa5e1be86e2bcf264f037eecc.tar.gz
bump version to 5.6 and disable a warning
Includes: cd libmnl && ./autogen.sh && ./configure && git add -f config.h then rip out comments and unused portions Test: TreeHugger Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: If5aaa80abb8846c971615f18efa35811e9c7afc7
-rw-r--r--Android.bp52
-rw-r--r--libmnl/config.h1
2 files changed, 19 insertions, 34 deletions
diff --git a/Android.bp b/Android.bp
index c1352bb..7b3dda3 100644
--- a/Android.bp
+++ b/Android.bp
@@ -37,45 +37,29 @@ license {
cc_binary {
name: "ethtool",
+ local_include_dirs: [
+ "uapi",
+ "libmnl",
+ "libmnl/include",
+ ],
srcs: [
- "amd8111e.c",
- "at76c50x-usb.c",
- "de2104x.c",
- "dsa.c",
- "e100.c",
- "e1000.c",
- "et131x.c",
- "ethtool.c",
- "fec.c",
- "fec_8xx.c",
- "fjes.c",
- "ibm_emac.c",
- "igb.c",
- "ixgb.c",
- "ixgbe.c",
- "ixgbevf.c",
- "lan78xx.c",
- "marvell.c",
- "natsemi.c",
- "pcnet32.c",
- "qsfp.c",
- "realtek.c",
- "rxclass.c",
- "sfc.c",
- "sff-common.c",
- "sfpdiag.c",
- "sfpid.c",
- "smsc911x.c",
- "stmmac.c",
- "tg3.c",
- "tse.c",
- "vioc.c",
- "vmxnet3.c",
+ "libmnl/src/*.c",
+ "netlink/*.c",
+ "[a-s]*.c",
+ "t[a-d]*.c",
+ // avoid test-*.c -- note these are shell globs, not regexps
+ "t[f-z]*.c",
+ "[u-z]*.c",
],
cflags: [
"-Wno-missing-field-initializers",
+ "-Wno-gnu-pointer-arith",
+ "-Wno-gnu-variable-sized-type-not-at-end",
+ "-Wno-unused-parameter",
+ "-DETHTOOL_ENABLE_NETLINK",
+ "-DETHTOOL_ENABLE_PRETTY_DUMP",
"-DPACKAGE=\"ethtool\"",
- "-DVERSION=\"5.4\"",
+ "-DVERSION=\"5.6\"",
],
apex_available: [
"com.android.tethering",
diff --git a/libmnl/config.h b/libmnl/config.h
new file mode 100644
index 0000000..f7c60e2
--- /dev/null
+++ b/libmnl/config.h
@@ -0,0 +1 @@
+#define HAVE_VISIBILITY_HIDDEN 1