Commit graph

496 commits

Author SHA1 Message Date
Bill Rassieur
e30cb86c94 Merge master@5428150 into git_qt-dev-plus-aosp.
Change-Id: I3b15c969e6cb32fb8f89737a019db112a3229350
BUG: 129345239
2019-04-02 18:26:31 +00:00
Alistair Strachan
fbafe83a7a Add CONFIG_PSI to recommended am: aaf4b964e6 am: a115e72680
am: 0d9b57d339

Change-Id: I58495494e9557d865b6f9492c426bd59421927c9
2019-03-27 01:28:29 -07:00
Alistair Strachan
d9b88e213c Add CONFIG_DM_BOW to recommended am: c85479e4c1 am: 34f286db60
am: 3e3db321b3

Change-Id: I4543559e11a598178555d78fc9bda9d600721033
2019-03-27 01:28:20 -07:00
Alistair Strachan
0d9b57d339 Add CONFIG_PSI to recommended am: aaf4b964e6
am: a115e72680

Change-Id: Ib1585a49cd310e42cafdefb04755e46351fdceb1
2019-03-27 01:13:57 -07:00
Alistair Strachan
3e3db321b3 Add CONFIG_DM_BOW to recommended am: c85479e4c1
am: 34f286db60

Change-Id: Ia62c2adfd59ada1830a5c9e0870ab06a203a89af
2019-03-27 01:13:53 -07:00
Alistair Strachan
a115e72680 Add CONFIG_PSI to recommended
am: aaf4b964e6

Change-Id: Ife2ff5fff41ffdef4b18402ff161c093a9cfe23f
2019-03-27 01:09:55 -07:00
Alistair Strachan
34f286db60 Add CONFIG_DM_BOW to recommended
am: c85479e4c1

Change-Id: I9e92bd176cf211421835f7ee182e5c9ff6e1e416
2019-03-27 01:09:52 -07:00
Alistair Strachan
aaf4b964e6 Add CONFIG_PSI to recommended
This feature is not (yet?) required for Go, so we need to put it in
'recommended'.

Bug: 127712811
Change-Id: I1276965a4f5e8ba31d27166caf41220985ceb7bf
Signed-off-by: Alistair Strachan <astrachan@google.com>
2019-03-27 07:55:44 +00:00
Alistair Strachan
c85479e4c1 Add CONFIG_DM_BOW to recommended
If you are using Q on ext4 userdata, you need this feature.

Bug: 119769411
Change-Id: Ie00d9593614387ffc85e56961e18523b78f353f8
Signed-off-by: Alistair Strachan <astrachan@google.com>
2019-03-27 07:55:29 +00:00
Sandeep Patil
ba2005f654 android-recommended: Keep CONFIG_KSM disabled am: 87a7a7fe07 am: 174fb5c1e1
am: 84e8f1dec6

Change-Id: Ib3871569772ef9cf9466a777559c5716af6c2802
2019-03-26 14:23:19 -07:00
Sandeep Patil
84e8f1dec6 android-recommended: Keep CONFIG_KSM disabled am: 87a7a7fe07
am: 174fb5c1e1

Change-Id: Idf3e29b199d4faa45281b5e150acdc7942895185
2019-03-26 13:36:56 -07:00
Sandeep Patil
174fb5c1e1 android-recommended: Keep CONFIG_KSM disabled
am: 87a7a7fe07

Change-Id: If28055881754349deef24454f7902d902464a0d6
2019-03-26 13:20:35 -07:00
Sandeep Patil
87a7a7fe07 android-recommended: Keep CONFIG_KSM disabled
Bug: 115637122
Fixes: 115637122

Change-Id: Ifb5f70268b4b607b7639ac2b1400d620861d917d
Signed-off-by: Sandeep Patil <sspatil@google.com>
2019-03-25 23:20:48 -07:00
Maciej enczykowski
dd0b7a819f Require CONFIG_USB_RTL8152 != n if we have host usb support. am: 56ca936e4f am: 53ec17ac02
am: 33f0ebd37c

Change-Id: I480e73fca8edf519fc1e23846941b6afc6e53ed4
2019-03-07 16:14:27 -08:00
Maciej enczykowski
33f0ebd37c Require CONFIG_USB_RTL8152 != n if we have host usb support. am: 56ca936e4f
am: 53ec17ac02

Change-Id: Ic181e53fa02cc50a1d61733e42d2a104b1b3621e
2019-03-07 15:17:22 -08:00
Maciej enczykowski
53ec17ac02 Require CONFIG_USB_RTL8152 != n if we have host usb support.
am: 56ca936e4f

Change-Id: I6c2580be51d8520c96f2bfb736183123357b01b0
2019-03-07 14:54:58 -08:00
Maciej Żenczykowski
56ca936e4f Require CONFIG_USB_RTL8152 != n if we have host usb support.
We want to require the r8152 usb ethernet gigabit dongle driver
on any device with a usb host port (like the USB-C port on a standard
phone).

ie. we want:

  CONFIG_USB in {m,y}  -->  CONFIG_USB_RTL8152 in {m,y}

which can be logically reversed to

  CONFIG_USB_RTL8152 = n  -->  CONFIG_USB = n

which is implementable with current conditional xml syntax.

Bug: 110755806
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I0fabe8c48536fbc597751afd34418e4ff42a06c6
2019-03-06 16:45:05 -08:00
Maciej enczykowski
598964722e android-4.9+: add CONFIG_NETFILTER_XT_TARGET_CT=y to base config am: d5d4f856ff am: c96f5aa12e
am: cee0088c7e

Change-Id: Idc22c45dde559319149124c500e805da2e36ab5b
2019-03-06 07:38:55 -08:00
Maciej enczykowski
cee0088c7e android-4.9+: add CONFIG_NETFILTER_XT_TARGET_CT=y to base config am: d5d4f856ff
am: c96f5aa12e

Change-Id: I642476943419fc2f5a9289dec0649a372d166eb2
2019-03-06 07:34:55 -08:00
Maciej enczykowski
c96f5aa12e android-4.9+: add CONFIG_NETFILTER_XT_TARGET_CT=y to base config
am: d5d4f856ff

Change-Id: Iea7fe8274c9288fec667a220505295541814cdab
2019-03-06 07:30:53 -08:00
Maciej Żenczykowski
d5d4f856ff android-4.9+: add CONFIG_NETFILTER_XT_TARGET_CT=y to base config
In practice, AFAICT, this has always been required just never documented.

Bug: 124361845
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I6035ef8e75f9daada706a9233999368a22904c4e
2019-03-05 22:50:14 -08:00
Martijn Coenen
8ad72206cf Require CONFIG_DM_VERITY and CONFIG_BLK_DEV_LOOP. am: 6b79d9cb6a am: dfc295606e
am: f9d4dedf7c

Change-Id: I26579a7a3f8ef4426cf4ad89da4c0208bc066e00
2019-03-04 00:08:51 -08:00
Martijn Coenen
f9d4dedf7c Require CONFIG_DM_VERITY and CONFIG_BLK_DEV_LOOP. am: 6b79d9cb6a
am: dfc295606e

Change-Id: Ie92028fce307511311e251bde92355490f1a4230
2019-03-04 00:04:50 -08:00
Martijn Coenen
dfc295606e Require CONFIG_DM_VERITY and CONFIG_BLK_DEV_LOOP.
am: 6b79d9cb6a

Change-Id: I99b6344296ea4020b9a9e77ea3bfc92a2e957525
2019-03-03 23:56:22 -08:00
Martijn Coenen
6b79d9cb6a Require CONFIG_DM_VERITY and CONFIG_BLK_DEV_LOOP.
These are required for APEX modules, which are required starting with
Q.

Bug: 119022885
Test: builds
Change-Id: I9f1fadf3cb842f2d86f7adb5d9beb31e3c9b8be8
2019-03-01 18:39:54 +00:00
Yifan Hong
2cfcbdeb7f Merge "Require CONFIG_MD=y." am: 5783754adb am: a257433266
am: 18f4df8493

Change-Id: Ic6545e5739baae303c9b1c4ddd25a3c8a86ffd25
2019-02-26 13:04:42 -08:00
Yifan Hong
18f4df8493 Merge "Require CONFIG_MD=y." am: 5783754adb
am: a257433266

Change-Id: I76b7b6c54640e01e569ef14e012e4e5ac3a64410
2019-02-26 13:00:41 -08:00
Yifan Hong
a257433266 Merge "Require CONFIG_MD=y."
am: 5783754adb

Change-Id: Ie4d56a21641b062959502fd68e8867ef2178d769
2019-02-26 12:55:33 -08:00
Yifan Hong
5783754adb Merge "Require CONFIG_MD=y." 2019-02-26 20:31:56 +00:00
Maciej enczykowski
43ac28cf43 p/android-4.9+: relax QTAGUID requirements am: 1d961dc1ab am: 7160fe215f
am: dcaf9f78af

Change-Id: Ic9ff7edf455f678d893787c5ccb793c345a568a9
2019-02-25 18:39:47 -08:00
Yifan Hong
3a460c90e1 Require CONFIG_MD=y.
Require devices launching with Q to support dynamic partitions.

Also, remove from recommended list.

Bug: 124527106
Test: builds
Change-Id: I8fbf9a671e0b58eacadbb02d204ab5935061a73d
2019-02-25 17:12:54 -08:00
Maciej enczykowski
dcaf9f78af p/android-4.9+: relax QTAGUID requirements am: 1d961dc1ab
am: 7160fe215f

Change-Id: I5b678f8a72517c4fab4474b403541fdf4b3c1d12
2019-02-25 17:05:11 -08:00
Xin Li
ac29030897 [automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master am: 9c1e14585f -s ours
am: 3ef6518b09 -s ours
am skip reason: subject contains skip directive

Change-Id: I3ad6ab823f4bb5812554cd4d0462c8c8661cc942
2019-02-25 08:09:40 -08:00
Xin Li
3ef6518b09 [automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
am: 9c1e14585f -s ours
am skip reason: subject contains skip directive

Change-Id: I447204a19cb6a304f10b8faaf7b5bad112113658
2019-02-25 05:47:42 -08:00
Maciej enczykowski
7160fe215f p/android-4.9+: relax QTAGUID requirements
am: 1d961dc1ab

Change-Id: Iea69dc40f99b3f994fea15cfdc2bff7525f36240
2019-02-22 17:21:40 -08:00
Maciej Żenczykowski
1d961dc1ab p/android-4.9+: relax QTAGUID requirements
Q userspace will use eBPF for bandwidth measurement
and does not require QTAGUID netfilter extension.
As such we are okay with either QTAGUID or the less
functional but sufficient OWNER extension (provided
the requisite eBPF config options are also enabled).

ie. we require either XT_MATCH_QTAGUID or XT_MATCH_OWNER.

Furthermore XT_MATCH_OWNER also requires:
  CONFIG_BPF_SYSCALL=y
  CONFIG_CGROUP_BPF=y
  CONFIG_NETFILTER_XT_MATCH_BPF=y
  CONFIG_NET_CLS_BPF=y
(the first 3 of which are already base requirements on P 4.9+)

Note: while this change is complex, it *widens* the
set of valid kernel configurations.  Any kernel that passed
configuration requirements before this change will also pass
them after this change.  However additionally this allows a
Q kernel to pass on a shipped as P but then upgraded to Q
device.

Also note that as Alistair points out this doesn't work for
shipped as O then upgraded to Q devices, as:
  system/bpf/libbpf_android/BpfUtils.cpp
is still checking "first_api_level" for P, and thus will not
use eBPF and thus it would actually break without QTAGUID.

Bug: 125362907
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ia6ce9e857d260cc6c74dd59731555479f7d38078
2019-02-22 13:49:45 -08:00
Xin Li
9c1e14585f DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
Bug: 120848293
Change-Id: If72428d426199fb2c6124ed1a6c9334acb138327
2019-02-20 16:19:31 -08:00
Maciej enczykowski
6323897e63 android-4.9+: add CONFIG_NET_SCH_NETEM=y to recommended config am: 8c186b2881 am: 1fc9c04a77
am: 93ee33a6bc

Change-Id: Ibad75061cd85126d85d37ea3db22a39508bff673
2019-02-14 17:58:15 -08:00
Maciej enczykowski
93ee33a6bc android-4.9+: add CONFIG_NET_SCH_NETEM=y to recommended config am: 8c186b2881
am: 1fc9c04a77

Change-Id: I7219b77c030a658e5c02ed85df2645874cad1ab4
2019-02-14 17:55:07 -08:00
Maciej enczykowski
1fc9c04a77 android-4.9+: add CONFIG_NET_SCH_NETEM=y to recommended config
am: 8c186b2881

Change-Id: I641a1542cd335fc9d2d212e69e0e82544562da14
2019-02-14 16:37:58 -08:00
Maciej Żenczykowski
8c186b2881 android-4.9+: add CONFIG_NET_SCH_NETEM=y to recommended config
I've received multiple requests to enable the use of the 'netem'
packet scheduling qdisc.  I've also wanted to use it myself.

The amount of code is trivial (~1000 lines of code), but it enables
some pretty useful functionality - although mostly for debugging,
troubleshooting and testing.

One can use netem to introduce delays or packet loss and in general
reproduce a lower quality network.

Now that we've fixed iproute2 to enable support for more qdiscs,
it makes sense to also enable support for it in the kernel.

Bug: 124467469
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I0169514a997a77d044209a5b017d5f306fb3308e
2019-02-14 15:13:13 -08:00
Chenbo Feng
68812b9519 Merge "Turn on xt_owner module to replace xt_qtaguid" am: 2ad58ef761 am: c6b87c0009
am: c11fc05626

Change-Id: I5ce2e1651576335a3f8e8ca4a0993d214f88c6c2
2019-02-11 16:29:16 -08:00
Chenbo Feng
c11fc05626 Merge "Turn on xt_owner module to replace xt_qtaguid" am: 2ad58ef761
am: c6b87c0009

Change-Id: I387518364448f3630423cbde73614152ee69acba
2019-02-11 16:08:01 -08:00
Chenbo Feng
c6b87c0009 Merge "Turn on xt_owner module to replace xt_qtaguid"
am: 2ad58ef761

Change-Id: I98243037ab10d21941f22dff4e63ce3094f5340e
2019-02-11 15:54:42 -08:00
Treehugger Robot
2ad58ef761 Merge "Turn on xt_owner module to replace xt_qtaguid" 2019-02-11 23:25:29 +00:00
Mark Salyzyn
093940c0c4 Add CONFIG_OVERLAY_FS=y am: ca6a1fe876 am: 32f1f25ccc
am: 6bf4397778

Change-Id: If85196ac490140f89198b231fd127b0f625c0805
2019-02-11 14:26:04 -08:00
Mark Salyzyn
6bf4397778 Add CONFIG_OVERLAY_FS=y am: ca6a1fe876
am: 32f1f25ccc

Change-Id: Ife0ee69de8c3588defd33afc4cb9fd5d09ec1f0b
2019-02-11 14:16:05 -08:00
Mark Salyzyn
32f1f25ccc Add CONFIG_OVERLAY_FS=y
am: ca6a1fe876

Change-Id: Ifcb9b0bfb26751671e98c9493399d473132b4a96
2019-02-11 14:10:59 -08:00
Mark Salyzyn
ca6a1fe876 Add CONFIG_OVERLAY_FS=y
Required for overlayfs integration support for adb remount
command.  A requirement for any device that supports a
readonly filesystem, which includes erofs, squashfs, ext4 dedupe,
or right sized (zero space remaining) for any filesystem type
selected for the system images.

Required for vendor overlays.

Signed-off-by: Mark Salyzyn <salyzyn@google.com>
Test: adb-remount-test.sh
Bug: 109821005
Change-Id: I3ece03886db7cc97f864497cf93ec6c6c39bccd1
2019-02-11 11:42:58 -08:00
Benedict Wong
28038b85c0 Add XFRM Interfaces option to base am: 9f16115a26 am: 90569de2ea
am: 120616dd78

Change-Id: I2b21ec92176333200315266356413908986e19d6
2019-02-11 11:42:35 -08:00