aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLorenzo Colitti <lorenzo@google.com>2017-04-05 09:05:39 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-04-05 09:05:39 +0000
commitcb3ecb05806ebd0cb639a72940de43e59bfa384e (patch)
tree3d0bf293ce450de2b8b05ae025d5fae3fb63eff0
parente20d6bf62b07e455e15b3d8982fb83dc99b9e564 (diff)
parent73dffad4bab8cacd9eb98370d4980fef1ee5a3aa (diff)
downloadplatform_external_iptables-cb3ecb05806ebd0cb639a72940de43e59bfa384e.tar.gz
platform_external_iptables-cb3ecb05806ebd0cb639a72940de43e59bfa384e.tar.bz2
platform_external_iptables-cb3ecb05806ebd0cb639a72940de43e59bfa384e.zip
Merge "Always build the iptables lock when building iptables." am: bb975c0535
am: 73dffad4ba Change-Id: I8fb24596e1d0ab5669fbe4f06d2b6a5901d8e9d4
-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 \