Always build the iptables lock when building iptables.
We have a build target for it, but it is not built by default. We
did not catch this in testing because:
1. Any device that mounts /system read-write (such as a device
used for development) will not enounter this problem because
iptables creates the file if it does not exist.
2. Running "mmm external/iptables" before flashing will build the
lock.
Bug: 36826873
Test: lock=$OUT/system/etc/xtables.lock && rm -f $lock && make -j64 iptables && ls -l $lock
Test: deleting the lock and rebuilding/flashing causes the lock to exist on device
(cherry picked from commit 10cdfd55b3f2fe1011375b95b46cfbcc7d85a979)
Change-Id: I183955159cd6f7724d57b737d07f8d539613a07c
(cherry picked from commit 957abd46436a349dfc3bb9847f641ff52b94af6d)
diff --git a/iptables/Android.mk b/iptables/Android.mk
index 52ecc21..095b90d 100644
--- a/iptables/Android.mk
+++ b/iptables/Android.mk
@@ -36,6 +36,8 @@
LOCAL_CFLAGS+=-D__ANDROID__
LOCAL_CFLAGS += $(commonFlags)
+LOCAL_REQUIRED_MODULES := xtables.lock
+
LOCAL_SRC_FILES:= \
xtables-multi.c iptables-xml.c xshared.c \
iptables-save.c iptables-restore.c \
@@ -74,6 +76,8 @@
LOCAL_CFLAGS+=-D__ANDROID__
LOCAL_CFLAGS += $(commonFlags)
+LOCAL_REQUIRED_MODULES := xtables.lock
+
LOCAL_SRC_FILES:= \
xtables-multi.c iptables-xml.c xshared.c \
ip6tables-save.c ip6tables-restore.c \
