diff options
author | Lorenzo Colitti <lorenzo@google.com> | 2017-04-05 09:10:39 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-04-05 09:10:39 +0000 |
commit | 8bf99d0af7f70b0fb089ce0760e2ca9de3e6df77 (patch) | |
tree | 3d0bf293ce450de2b8b05ae025d5fae3fb63eff0 | |
parent | 3c9546c0d95e649f59e239b9a20ef398eb553774 (diff) | |
parent | 516757476beb04f4071d093cb20f1236ed761892 (diff) | |
download | platform_external_iptables-8bf99d0af7f70b0fb089ce0760e2ca9de3e6df77.tar.gz platform_external_iptables-8bf99d0af7f70b0fb089ce0760e2ca9de3e6df77.tar.bz2 platform_external_iptables-8bf99d0af7f70b0fb089ce0760e2ca9de3e6df77.zip |
Merge "Always build the iptables lock when building iptables." am: bb975c0535 am: 73dffad4ba am: cb3ecb0580
am: 516757476b
Change-Id: I40a5579423127020cda04a79ee160a5ab89851c0
-rw-r--r-- | iptables/Android.mk | 4 |
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 \ |