diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2017-04-05 16:04:23 +0900 |
|---|---|---|
| committer | gitbuildkicker <android-build@google.com> | 2017-04-05 13:14:51 -0700 |
| commit | 655ab485cdb405b3ef3576e096ea585baa40d9f2 (patch) | |
| tree | 3d0bf293ce450de2b8b05ae025d5fae3fb63eff0 | |
| parent | 3c9546c0d95e649f59e239b9a20ef398eb553774 (diff) | |
| download | iptables-oreo-r3-release.tar.gz | |
Always build the iptables lock when building iptables.android-security-8.0.0_r54android-security-8.0.0_r53android-security-8.0.0_r52android-o-preview-4android-o-preview-3android-o-preview-2android-cts-8.0_r9android-cts-8.0_r8android-cts-8.0_r7android-cts-8.0_r6android-cts-8.0_r5android-cts-8.0_r4android-cts-8.0_r3android-cts-8.0_r26android-cts-8.0_r25android-cts-8.0_r24android-cts-8.0_r23android-cts-8.0_r22android-cts-8.0_r21android-cts-8.0_r20android-cts-8.0_r2android-cts-8.0_r19android-cts-8.0_r18android-cts-8.0_r17android-cts-8.0_r16android-cts-8.0_r15android-cts-8.0_r14android-cts-8.0_r13android-cts-8.0_r12android-cts-8.0_r11android-cts-8.0_r10android-cts-8.0_r1android-8.0.0_r9android-8.0.0_r7android-8.0.0_r51android-8.0.0_r50android-8.0.0_r49android-8.0.0_r48android-8.0.0_r47android-8.0.0_r46android-8.0.0_r45android-8.0.0_r44android-8.0.0_r43android-8.0.0_r42android-8.0.0_r41android-8.0.0_r40android-8.0.0_r4android-8.0.0_r39android-8.0.0_r38android-8.0.0_r37android-8.0.0_r36android-8.0.0_r35android-8.0.0_r32android-8.0.0_r31android-8.0.0_r30android-8.0.0_r3android-8.0.0_r29android-8.0.0_r28android-8.0.0_r2android-8.0.0_r17android-8.0.0_r16android-8.0.0_r15android-8.0.0_r13android-8.0.0_r12android-8.0.0_r11android-8.0.0_r10android-8.0.0_r1security-oc-releaseoreo-security-releaseoreo-releaseoreo-r6-releaseoreo-r5-releaseoreo-r4-releaseoreo-r3-releaseoreo-r2-releaseoreo-cts-releaseo-preview-4o-preview-3o-preview-2
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)
| -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 \ |