aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLorenzo Colitti <lorenzo@google.com>2017-04-05 09:03:09 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-04-05 09:03:09 +0000
commit73dffad4bab8cacd9eb98370d4980fef1ee5a3aa (patch)
tree3d0bf293ce450de2b8b05ae025d5fae3fb63eff0
parentff45753ae3c3108c6c93ec132f7cf62190f9c628 (diff)
parentbb975c0535103771a6b1835c05025bfd3a43d95d (diff)
downloadiptables-73dffad4bab8cacd9eb98370d4980fef1ee5a3aa.tar.gz
Merge "Always build the iptables lock when building iptables."
am: bb975c0535 Change-Id: I2c008e6800aa990b48908c492ed63e2dd5c27920
-rw-r--r--iptables/Android.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/iptables/Android.mk b/iptables/Android.mk
index 52ecc21f..095b90dc 100644
--- a/iptables/Android.mk
+++ b/iptables/Android.mk
@@ -36,6 +36,8 @@ LOCAL_CFLAGS+=-D_LARGEFILE_SOURCE=1 -D_LARGE_FILES -D_FILE_OFFSET_BITS=64 -D_REE
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_LARGEFILE_SOURCE=1 -D_LARGE_FILES -D_FILE_OFFSET_BITS=64 -D_REE
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 \