p/android-4.9+: relax QTAGUID requirements am: 1d961dc1ab am: 7160fe215f

am: dcaf9f78af

Change-Id: Ic9ff7edf455f678d893787c5ccb793c345a568a9
This commit is contained in:
Maciej enczykowski 2019-02-25 18:39:47 -08:00 committed by android-build-merger
commit 43ac28cf43
4 changed files with 60 additions and 2 deletions

View file

@ -1 +1,31 @@
<kernel minlts="4.14.42" />
<!-- CONFIG_NETFILTER_XT_MATCH_QTAGUID || (CONFIG_NETFILTER_XT_MATCH_OWNER && BPF) -->
<group>
<conditions>
<config>
<key>CONFIG_NETFILTER_XT_MATCH_QTAGUID</key>
<value type="bool">n</value>
</config>
</conditions>
<config>
<key>CONFIG_NETFILTER_XT_MATCH_OWNER</key>
<value type="bool">y</value>
</config>
<config>
<key>CONFIG_NET_CLS_BPF</key>
<value type="bool">y</value>
</config>
</group>
<group>
<conditions>
<config>
<key>CONFIG_NETFILTER_XT_MATCH_OWNER</key>
<value type="bool">n</value>
</config>
</conditions>
<config>
<key>CONFIG_NETFILTER_XT_MATCH_QTAGUID</key>
<value type="bool">y</value>
</config>
</group>

View file

@ -103,7 +103,6 @@ CONFIG_NETFILTER_XT_MATCH_MAC=y
CONFIG_NETFILTER_XT_MATCH_MARK=y
CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y
CONFIG_NETFILTER_XT_MATCH_POLICY=y
CONFIG_NETFILTER_XT_MATCH_QTAGUID=y
CONFIG_NETFILTER_XT_MATCH_QUOTA2=y
CONFIG_NETFILTER_XT_MATCH_QUOTA=y
CONFIG_NETFILTER_XT_MATCH_SOCKET=y

View file

@ -1 +1,31 @@
<kernel minlts="4.9.84" />
<!-- CONFIG_NETFILTER_XT_MATCH_QTAGUID || (CONFIG_NETFILTER_XT_MATCH_OWNER && BPF) -->
<group>
<conditions>
<config>
<key>CONFIG_NETFILTER_XT_MATCH_QTAGUID</key>
<value type="bool">n</value>
</config>
</conditions>
<config>
<key>CONFIG_NETFILTER_XT_MATCH_OWNER</key>
<value type="bool">y</value>
</config>
<config>
<key>CONFIG_NET_CLS_BPF</key>
<value type="bool">y</value>
</config>
</group>
<group>
<conditions>
<config>
<key>CONFIG_NETFILTER_XT_MATCH_OWNER</key>
<value type="bool">n</value>
</config>
</conditions>
<config>
<key>CONFIG_NETFILTER_XT_MATCH_QTAGUID</key>
<value type="bool">y</value>
</config>
</group>

View file

@ -101,7 +101,6 @@ CONFIG_NETFILTER_XT_MATCH_MAC=y
CONFIG_NETFILTER_XT_MATCH_MARK=y
CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y
CONFIG_NETFILTER_XT_MATCH_POLICY=y
CONFIG_NETFILTER_XT_MATCH_QTAGUID=y
CONFIG_NETFILTER_XT_MATCH_QUOTA2=y
CONFIG_NETFILTER_XT_MATCH_QUOTA=y
CONFIG_NETFILTER_XT_MATCH_SOCKET=y