Permalink
Switch branches/tags
android-wear-o-preview-4 android-wear-o-preview-3 android-wear-n-preview-2 android-wear-n-preview-1 android-wear-8.0.0_r1 android-wear-7.1.1_r1 android-wear-5.1.1_r1 android-wear-5.1.0_r1 android-wear-5.0.0_r1 android-vts-8.0_r7 android-vts-8.0_r6 android-vts-8.0_r2 android-vts-8.0_r1 android-sdk-support_r11 android-sdk-adt_r20 android-sdk-adt_r16.0.1 android-sdk-4.4.2_r1.0.1 android-sdk-4.4.2_r1 android-sdk-4.0.3_r1 android-sdk-4.0.3-tools_r1 android-o-preview-4 android-o-preview-3 android-o-preview-2 android-o-preview-1 android-o-mr1-preview-2 android-o-mr1-preview-1 android-o-mr1-iot-preview-6 android-o-iot-preview-5 android-n-preview-5 android-n-preview-4 android-n-preview-3 android-n-preview-2 android-n-preview-1 android-n-mr2-preview-2 android-n-mr2-preview-1 android-n-mr1-preview-2 android-n-mr1-preview-1 android-n-iot-preview-4 android-n-iot-preview-2 android-m-preview android-m-preview-2 android-m-preview-1 android-lego-6.0.1_r2 android-lego-6.0.1_r1 android-l-preview_r2 android-cts-verifier-4.0.3_r1 android-cts-verifier-4.0_r1 android-cts-8.1_r2 android-cts-8.1_r1 android-cts-8.0_r6 android-cts-8.0_r5 android-cts-8.0_r4 android-cts-8.0_r3 android-cts-8.0_r2 android-cts-8.0_r1 android-cts-7.1_r14 android-cts-7.1_r13 android-cts-7.1_r12 android-cts-7.1_r11 android-cts-7.1_r10 android-cts-7.1_r9 android-cts-7.1_r8 android-cts-7.1_r7 android-cts-7.1_r6 android-cts-7.1_r5 android-cts-7.1_r4 android-cts-7.1_r3 android-cts-7.1_r2 android-cts-7.1_r1 android-cts-7.0_r18 android-cts-7.0_r17 android-cts-7.0_r16 android-cts-7.0_r15 android-cts-7.0_r14 android-cts-7.0_r13 android-cts-7.0_r12 android-cts-7.0_r11 android-cts-7.0_r10 android-cts-7.0_r9 android-cts-7.0_r8 android-cts-7.0_r7 android-cts-7.0_r6 android-cts-7.0_r5 android-cts-7.0_r4 android-cts-7.0_r3 android-cts-7.0_r2 android-cts-7.0_r1 android-cts-6.0_r26 android-cts-6.0_r25 android-cts-6.0_r24 android-cts-6.0_r23 android-cts-6.0_r22 android-cts-6.0_r21 android-cts-6.0_r20 android-cts-6.0_r19 android-cts-6.0_r18 android-cts-6.0_r17 android-cts-6.0_r16 android-cts-6.0_r15 android-cts-6.0_r14
Nothing to show
Commits on Oct 15, 2017
  1. Merge "Use -Werror in external/iptables" am: 447f5e3 am: f86d7ad

    chih-hung authored and android-build-merger committed Oct 15, 2017
    am: 7bf5d8c
    
    Change-Id: I64c43b50aff580d5020eae8cc618258f6c39f670
  2. Merge "Use -Werror in external/iptables" am: 447f5e3

    chih-hung authored and android-build-merger committed Oct 15, 2017
    am: f86d7ad
    
    Change-Id: If615b6010d9419e64dffd4ece5bb7cf47ce40dbf
  3. Merge "Use -Werror in external/iptables"

    chih-hung authored and android-build-merger committed Oct 15, 2017
    am: 447f5e3
    
    Change-Id: I80a90b6143bbf53172d8b149c8e34584ad044063
Commits on Oct 13, 2017
  1. Merge "Use -Werror in external/iptables"

    chih-hung authored and Gerrit Code Review committed Oct 13, 2017
Commits on Oct 10, 2017
  1. Use -Werror in external/iptables

    chih-hung committed Oct 10, 2017
    * Suppress unused function and format warnings.
    
    Bug: 66996870
    Test: build with WITH_TIDY=1
    Change-Id: Ieac5da864fcf26886d56dbb4a7cf9a55def39d56
Commits on Jul 6, 2017
  1. Merge "Trim OWNERS" am: 204461a am: 8ae1dff am: 2ab26b8

    ekline authored and android-build-merger committed Jul 6, 2017
    am: 896f87c
    
    Change-Id: I19356d328da9e63346efe64afdf1d546b65bae01
  2. Merge "Trim OWNERS" am: 204461a am: 8ae1dff

    ekline authored and android-build-merger committed Jul 6, 2017
    am: 2ab26b8
    
    Change-Id: I5c4959fb9a28ac00adeb53ca17d1faa343594f72
  3. Merge "Trim OWNERS" am: 204461a

    ekline authored and android-build-merger committed Jul 6, 2017
    am: 8ae1dff
    
    Change-Id: If2737e3cc8c252bb81abc22b0db31468824d5ead
  4. Merge "Trim OWNERS"

    ekline authored and android-build-merger committed Jul 6, 2017
    am: 204461a
    
    Change-Id: Id7ae344a5118cd655b64d2d1ed0a42f1477743a4
  5. Merge "Trim OWNERS"

    Treehugger Robot Gerrit Code Review
    Treehugger Robot authored and Gerrit Code Review committed Jul 6, 2017
  6. Trim OWNERS

    ekline committed Jul 6, 2017
    Test: none
    Change-Id: I17da46242aebb63f195f9fd199c94577c4db4fd0
Commits on Jun 21, 2017
  1. Merge "Add OWNERS in external/iptables" am: 9eeff14 am: c0d5e25 am: 1…

    chih-hung authored and android-build-merger committed Jun 21, 2017
    …e6a0ca
    
    am: 4ca097c
    
    Change-Id: I693381494e9170c11704bd805ce0811cc6281cb4
  2. Merge "Add OWNERS in external/iptables" am: 9eeff14 am: c0d5e25

    chih-hung authored and android-build-merger committed Jun 21, 2017
    am: 1e6a0ca
    
    Change-Id: I71575bbd9f8a2fb9f9936e8bfb5b5cb80a3a823e
  3. Merge "Add OWNERS in external/iptables" am: 9eeff14

    chih-hung authored and android-build-merger committed Jun 21, 2017
    am: c0d5e25
    
    Change-Id: I28f06a7233f0f31846db41b2a1f4285378cd569e
  4. Merge "Add OWNERS in external/iptables"

    chih-hung authored and android-build-merger committed Jun 21, 2017
    am: 9eeff14
    
    Change-Id: I2356c46e6018251f24c4802eea86a5cc3f66e807
  5. Merge "Add OWNERS in external/iptables"

    Treehugger Robot Gerrit Code Review
    Treehugger Robot authored and Gerrit Code Review committed Jun 21, 2017
  6. Add OWNERS in external/iptables

    chih-hung committed Jun 16, 2017
    * Owners are selected from top CL approvals or owners.
      They will be suggested to review/approve future CLs.
    * OWNERS files are recognized by the new find-owners plugin, see .md files in
      https://gerrit.googlesource.com/plugins/find-owners/+/master/src/main/resources/Documentation/
    
    Test: build/make/tools/checkowners.py -c -v OWNERS
    Change-Id: I703dce86a2b1d92084198bace04480172150f83f
Commits on Jun 1, 2017
  1. Merge "UPSTREAM: iptables: insist that the lock is held." am: c9c53db

    lcolitti authored and android-build-merger committed Jun 1, 2017
    …am: d6c570e am: 0132d73
    
    am: 990abd8
    
    Change-Id: Ibc219286a033753d55caf46757f8f140dd52f6b4
  2. Merge "UPSTREAM: iptables: insist that the lock is held." am: c9c53db

    lcolitti authored and android-build-merger committed Jun 1, 2017
    …am: d6c570e
    
    am: 0132d73
    
    Change-Id: I3d55dff912533dd9c7dc3fb74cc5aaaf7a20df6e
  3. Merge "UPSTREAM: iptables: insist that the lock is held." am: c9c53db

    lcolitti authored and android-build-merger committed Jun 1, 2017
    am: d6c570e
    
    Change-Id: If65490d2853ba4cbc8e060525ec48990dd37ec3b
  4. Merge "UPSTREAM: iptables: insist that the lock is held."

    lcolitti authored and android-build-merger committed Jun 1, 2017
    am: c9c53db
    
    Change-Id: I490a69bfad64a45bdc8736cacd4ced83da8c07f9
  5. Merge "UPSTREAM: iptables: insist that the lock is held."

    Treehugger Robot Gerrit Code Review
    Treehugger Robot authored and Gerrit Code Review committed Jun 1, 2017
Commits on May 31, 2017
  1. UPSTREAM: iptables: insist that the lock is held.

    lcolitti committed May 19, 2017
    Currently, iptables programs will exit with an error if the
    iptables lock cannot be acquired, but will silently continue if
    the lock cannot be opened at all. This can cause unexpected
    failures (with unhelpful error messages) in the presence of
    concurrent updates, which can be very difficult to find in a
    complex or multi-administrator system.
    
    Instead, refuse to do anything if the lock cannot be acquired.
    The behaviour is not affected by command-line flags because:
    
    1. In order to reliably avoid concurrent modification, all
       invocations of iptables commands must follow this behaviour.
    2. Whether or not the lock can be opened is typically not
       a run-time condition but is likely to be a configuration
       error.
    
    Existing systems that depended on things working mostly correctly
    even if there was no lock might be affected by this change.
    However, that is arguably a configuration error, and now that the
    iptables lock is configurable, it is trivial to provide a lock
    file that is always accessible: if nothing else, the iptables
    binary itself can be used. The lock does not have to be writable,
    only readable.
    
    Tested by configuring the system to use an xtables.lock file in
    a non-existent directory and observing that all commands failed.
    
    (cherry picked from iptables 80d8bfa)
    
    Test: aosp_bullhead-eng builds
    Change-Id: I1aec4eb2d9e3775806c93ccd6cf215af05e12f3c
    Signed-off-by: Lorenzo Colitti <lorenzo@google.com>
    Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Commits on Apr 5, 2017
  1. Always build the iptables lock when building iptables. am: 957abd4

    lcolitti authored and android-build-merger committed Apr 5, 2017
    am: e502a8a
    
    Change-Id: Ib2483877075accf29ce443a1d81623027d0fe9c0
  2. Always build the iptables lock when building iptables.

    lcolitti authored and android-build-merger committed Apr 5, 2017
    am: 957abd4
    
    Change-Id: Ibb2cd85ae1faf65b97e0356384b83ac15beb87db
  3. Merge "Always build the iptables lock when building iptables." am: bb…

    lcolitti authored and android-build-merger committed Apr 5, 2017
    …975c0 am: 73dffad am: cb3ecb0
    
    am: 5167574
    
    Change-Id: I40a5579423127020cda04a79ee160a5ab89851c0
  4. Merge "Always build the iptables lock when building iptables." am: bb…

    lcolitti authored and android-build-merger committed Apr 5, 2017
    …975c0 am: 73dffad
    
    am: cb3ecb0
    
    Change-Id: I4a5d167e9e5781b7d1bacd06d8a6d8b15458e717
  5. Merge "Always build the iptables lock when building iptables." am: bb…

    lcolitti authored and android-build-merger committed Apr 5, 2017
    …975c0
    
    am: 73dffad
    
    Change-Id: I8fb24596e1d0ab5669fbe4f06d2b6a5901d8e9d4
  6. Merge "Always build the iptables lock when building iptables."

    lcolitti authored and android-build-merger committed Apr 5, 2017
    am: bb975c0
    
    Change-Id: I2c008e6800aa990b48908c492ed63e2dd5c27920
  7. Merge "Always build the iptables lock when building iptables."

    Treehugger Robot Gerrit Code Review
    Treehugger Robot authored and Gerrit Code Review committed Apr 5, 2017
  8. Always build the iptables lock when building iptables.

    lcolitti committed Apr 5, 2017
    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 10cdfd5)
    
    Change-Id: I183955159cd6f7724d57b737d07f8d539613a07c
  9. Always build the iptables lock when building iptables.

    lcolitti committed Apr 5, 2017
    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
    Change-Id: I15a85c02e990f347031accdd29cc3e831ec631c2
Commits on Mar 24, 2017
  1. Merge changes from topic 'iptables-1.6.1' am: c784fc4 am: ff45753

    lcolitti authored and android-build-merger committed Mar 24, 2017
    am: e20d6bf
    
    Change-Id: I7f42039a088b89201367df2b0a926fcd88987776
  2. Merge changes from topic 'iptables-1.6.1' am: c784fc4

    lcolitti authored and android-build-merger committed Mar 24, 2017
    am: ff45753
    
    Change-Id: Ic463667ae6ac346f8eae4b6ca18888dcd24b9d6d
  3. Merge changes from topic 'iptables-1.6.1'

    lcolitti authored and android-build-merger committed Mar 24, 2017
    am: c784fc4
    
    Change-Id: I9c26682631ff24de4215e553045036b94bfb611e