ebtables: Convert to standalone build
* There is no need to create 20 shared libraries on an Android
build. Convert to a standalone build to eliminate this noise.
* Additionally, the scriptage in the Android makefile causes
Ninja to regenerate it's configuration for every build. Fix it.
* These files can be generated by the standard makefile as part
of the "static" target.
Change-Id: I1de9f93caf563c10f49c72a884b4c96aaf5335e0
diff --git a/extensions/ebt_802_3.c b/extensions/ebt_802_3.c
index dd22eb2..2d84349 100644
--- a/extensions/ebt_802_3.c
+++ b/extensions/ebt_802_3.c
@@ -141,7 +141,7 @@
.extra_ops = opts,
};
-void _init(void)
+void _802_3_init(void)
{
ebt_register_match(&_802_3_match);
}
diff --git a/extensions/ebt_among.c b/extensions/ebt_among.c
index f97d07e..2f78ad1 100644
--- a/extensions/ebt_among.c
+++ b/extensions/ebt_among.c
@@ -491,7 +491,7 @@
.extra_ops = opts,
};
-void _init(void)
+void _among_init(void)
{
ebt_register_match(&among_match);
}
diff --git a/extensions/ebt_arp.c b/extensions/ebt_arp.c
index 64d337d..fd684ac 100644
--- a/extensions/ebt_arp.c
+++ b/extensions/ebt_arp.c
@@ -362,7 +362,7 @@
.extra_ops = opts,
};
-void _init(void)
+void _arp_init(void)
{
ebt_register_match(&arp_match);
}
diff --git a/extensions/ebt_arpreply.c b/extensions/ebt_arpreply.c
index c3757f3..3757097 100644
--- a/extensions/ebt_arpreply.c
+++ b/extensions/ebt_arpreply.c
@@ -133,7 +133,7 @@
.extra_ops = opts,
};
-void _init(void)
+void _arpreply_init(void)
{
ebt_register_target(&arpreply_target);
}
diff --git a/extensions/ebt_ip.c b/extensions/ebt_ip.c
index 4e0b7f0..86e9659 100644
--- a/extensions/ebt_ip.c
+++ b/extensions/ebt_ip.c
@@ -338,7 +338,7 @@
.extra_ops = opts,
};
-void _init(void)
+void _ip_init(void)
{
ebt_register_match(&ip_match);
}
diff --git a/extensions/ebt_ip6.c b/extensions/ebt_ip6.c
index 0465e77..7e65d76 100644
--- a/extensions/ebt_ip6.c
+++ b/extensions/ebt_ip6.c
@@ -556,7 +556,7 @@
.extra_ops = opts,
};
-void _init(void)
+void _ip6_init(void)
{
ebt_register_match(&ip6_match);
}
diff --git a/extensions/ebt_limit.c b/extensions/ebt_limit.c
index ee40e5c..6a443e5 100644
--- a/extensions/ebt_limit.c
+++ b/extensions/ebt_limit.c
@@ -212,7 +212,7 @@
.extra_ops = opts,
};
-void _init(void)
+void _limit_init(void)
{
ebt_register_match(&limit_match);
}
diff --git a/extensions/ebt_log.c b/extensions/ebt_log.c
index 1cf831a..053d73b 100644
--- a/extensions/ebt_log.c
+++ b/extensions/ebt_log.c
@@ -217,7 +217,7 @@
.extra_ops = opts,
};
-void _init(void)
+void _log_init(void)
{
ebt_register_watcher(&log_watcher);
}
diff --git a/extensions/ebt_mark.c b/extensions/ebt_mark.c
index 5776b1c..051e2e7 100644
--- a/extensions/ebt_mark.c
+++ b/extensions/ebt_mark.c
@@ -172,7 +172,7 @@
.extra_ops = opts,
};
-void _init(void)
+void _mark_init(void)
{
ebt_register_target(&mark_target);
}
diff --git a/extensions/ebt_mark_m.c b/extensions/ebt_mark_m.c
index 2a259b0..3ef6651 100644
--- a/extensions/ebt_mark_m.c
+++ b/extensions/ebt_mark_m.c
@@ -121,7 +121,7 @@
.extra_ops = opts,
};
-void _init(void)
+void _mark_m_init(void)
{
ebt_register_match(&mark_match);
}
diff --git a/extensions/ebt_nat.c b/extensions/ebt_nat.c
index e6afbf8..8405091 100644
--- a/extensions/ebt_nat.c
+++ b/extensions/ebt_nat.c
@@ -231,7 +231,7 @@
.extra_ops = opts_d,
};
-void _init(void)
+void _nat_init(void)
{
ebt_register_target(&snat_target);
ebt_register_target(&dnat_target);
diff --git a/extensions/ebt_nflog.c b/extensions/ebt_nflog.c
index 0cd10e0..89c5ce1 100644
--- a/extensions/ebt_nflog.c
+++ b/extensions/ebt_nflog.c
@@ -166,7 +166,7 @@
.extra_ops = nflog_opts,
};
-void _init(void)
+void _nflog_init(void)
{
ebt_register_watcher(&nflog_watcher);
}
diff --git a/extensions/ebt_pkttype.c b/extensions/ebt_pkttype.c
index 5b5cb03..d3d925e 100644
--- a/extensions/ebt_pkttype.c
+++ b/extensions/ebt_pkttype.c
@@ -125,7 +125,7 @@
.extra_ops = opts,
};
-void _init(void)
+void _pkttype_init(void)
{
ebt_register_match(&pkttype_match);
}
diff --git a/extensions/ebt_redirect.c b/extensions/ebt_redirect.c
index e470818..2ec4736 100644
--- a/extensions/ebt_redirect.c
+++ b/extensions/ebt_redirect.c
@@ -108,7 +108,7 @@
.extra_ops = opts,
};
-void _init(void)
+void _redirect_init(void)
{
ebt_register_target(&redirect_target);
}
diff --git a/extensions/ebt_standard.c b/extensions/ebt_standard.c
index 67d4d7c..a0e98d4 100644
--- a/extensions/ebt_standard.c
+++ b/extensions/ebt_standard.c
@@ -84,7 +84,7 @@
.extra_ops = opts,
};
-void _init(void)
+void _standard_init(void)
{
ebt_register_target(&standard);
}
diff --git a/extensions/ebt_stp.c b/extensions/ebt_stp.c
index 2b108a7..5e20f28 100644
--- a/extensions/ebt_stp.c
+++ b/extensions/ebt_stp.c
@@ -337,7 +337,7 @@
.extra_ops = opts,
};
-void _init(void)
+void _stp_init(void)
{
ebt_register_match(&stp_match);
}
diff --git a/extensions/ebt_ulog.c b/extensions/ebt_ulog.c
index 162586d..5c2896a 100644
--- a/extensions/ebt_ulog.c
+++ b/extensions/ebt_ulog.c
@@ -180,7 +180,7 @@
.extra_ops = opts,
};
-void _init(void)
+void _ulog_init(void)
{
ebt_register_watcher(&ulog_watcher);
}
diff --git a/extensions/ebt_vlan.c b/extensions/ebt_vlan.c
index 6714c82..a6b5e1c 100644
--- a/extensions/ebt_vlan.c
+++ b/extensions/ebt_vlan.c
@@ -181,7 +181,7 @@
.extra_ops = opts,
};
-void _init(void)
+void _vlan_init(void)
{
ebt_register_match(&vlan_match);
}
diff --git a/extensions/ebtable_broute.c b/extensions/ebtable_broute.c
index 5259355..ea7aa89 100644
--- a/extensions/ebtable_broute.c
+++ b/extensions/ebtable_broute.c
@@ -23,7 +23,7 @@
.help = print_help,
};
-void _init(void)
+void _t_broute_init(void)
{
ebt_register_table(&table);
}
diff --git a/extensions/ebtable_filter.c b/extensions/ebtable_filter.c
index e41fb84..5887d28 100644
--- a/extensions/ebtable_filter.c
+++ b/extensions/ebtable_filter.c
@@ -29,7 +29,7 @@
.help = print_help,
};
-void _init(void)
+void _t_filter_init(void)
{
ebt_register_table(&table);
}
diff --git a/extensions/ebtable_nat.c b/extensions/ebtable_nat.c
index b21c9dd..52c5542 100644
--- a/extensions/ebtable_nat.c
+++ b/extensions/ebtable_nat.c
@@ -30,7 +30,7 @@
.help = print_help,
};
-void _init(void)
+void _t_nat_init(void)
{
ebt_register_table(&table);
}