Commit graph

2066 commits

Author SHA1 Message Date
Yifan Hong
8d7294f01d android-4.14: remove quotes in CONFIG_ANDROID_BINDER_DEVICES
Test: builds and boots
Bug: 77886167
Change-Id: Id67fe39b56d5e0ff25a5eefb44f1d0e7cf04f6a4
Merged-In: Id67fe39b56d5e0ff25a5eefb44f1d0e7cf04f6a4
2018-04-16 08:20:44 -07:00
Yifan Hong
b13395dbed android-4.14: remove quotes in CONFIG_ANDROID_BINDER_DEVICES
Test: builds and boots
Bug: 77886167
Change-Id: Id67fe39b56d5e0ff25a5eefb44f1d0e7cf04f6a4
Merged-In: Id67fe39b56d5e0ff25a5eefb44f1d0e7cf04f6a4
2018-04-16 08:20:29 -07:00
Alistair Strachan
5222bad4f8 android-4.14: Add CONFIG_MEMCG{,_SWAP} requirement.
On older kernels it was ambiguous whether
CONFIG_ANDROID_LOW_MEMORY_KILLER or CONFIG_MEMCG should be enabled, but
on 4.14 there is no lmk driver so we rely on CONFIG_MEMCG.

Bug: 77736601
Change-Id: Iff24ac4ec903054cb2a9b858c09f01caeffc6d22
Signed-off-by: Alistair Strachan <astrachan@google.com>
Bug: 77982837
Merged-In: Iff24ac4ec903054cb2a9b858c09f01caeffc6d22
Signed-off-by: Steve Muckle <smuckle@google.com>
2018-04-13 11:22:06 -07:00
Greg Hackmann
c772c3e77e android-4.14: replace CONFIG_DEBUG_RODATA with CONFIG_STRICT_KERNEL_RWX
This was renamed in 4.10 by 0f5bf6d0afe4 ("arch: Rename
CONFIG_DEBUG_RODATA and CONFIG_DEBUG_MODULE_RONX") in order to clarify
the option's importance.

Bug: 76186455
Test: grep -E STRICT_KERNEL_RWX -A 3 \
	android-4.14/Documentation/security/self-protection.rst
Change-Id: I6cc3356849c098c5f4c63a6d144440d6fee3c346
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Bug: 77982837
Merged-In: I6cc3356849c098c5f4c63a6d144440d6fee3c346
Signed-off-by: Steve Muckle <smuckle@google.com>
2018-04-13 11:21:43 -07:00
Dmitry Shmidt
3ade9d41cb android-3.18: Move OABI_COMPAT to base-arm.cfg
Bug: 76186455
Test: no tests

Change-Id: Icf7ea1041f25ecd19aa6258ece44477c1e9948e5
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Bug: 77982837
Merged-In: Icf7ea1041f25ecd19aa6258ece44477c1e9948e5
Signed-off-by: Steve Muckle <smuckle@google.com>
2018-04-13 11:21:28 -07:00
Dmitry Shmidt
730db8c686 android-4.4: Move OABI_COMPAT to base-arm.cfg
Bug: 76186455
Test: no tests

Change-Id: I8451eb5514ec7b70444021f9f281ce8730f191f5
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Merged-In: I8451eb5514ec7b70444021f9f281ce8730f191f5
Bug: 77982837
Signed-off-by: Steve Muckle <smuckle@google.com>
2018-04-13 11:20:22 -07:00
Jaekyun Seok
b904d3c572 Remove INET_LRO & move OABI_COMPAT to base-arm.cfg
Bug: 76186455
Bug: 77982837
Test: no tests
Change-Id: I7e903748e3296acb6353afe834787195348c5784
Merged-In: I7e903748e3296acb6353afe834787195348c5784
2018-04-13 11:07:40 -07:00
android-build-team Robot
3d9cfc4d0a Snap for 4710783 from 2aa2b825bb to qt-release
Change-Id: Id21cd440903d47cfcb908dad3fdbe6f82f377c31
2018-04-10 09:34:04 +00:00
Alistair Strachan
2aa2b825bb android-4.14: Add CONFIG_MEMCG{,_SWAP} requirement. am: 9d8bb70886 am: c807799309
am: 0552d8a405

Change-Id: I398f9b1f5f59aff9e3326688261ba9f1138d4dfe
2018-04-09 12:10:26 -07:00
Alistair Strachan
0552d8a405 android-4.14: Add CONFIG_MEMCG{,_SWAP} requirement. am: 9d8bb70886
am: c807799309

Change-Id: If41ccc8dccca56d87180c2aa1599b4dad8a49735
2018-04-09 12:00:26 -07:00
Alistair Strachan
c807799309 android-4.14: Add CONFIG_MEMCG{,_SWAP} requirement.
am: 9d8bb70886

Change-Id: I5b7bdbf041d88c5d0d5be68a42d279ab78bfeb25
2018-04-09 11:55:24 -07:00
Alistair Strachan
9d8bb70886 android-4.14: Add CONFIG_MEMCG{,_SWAP} requirement.
On older kernels it was ambiguous whether
CONFIG_ANDROID_LOW_MEMORY_KILLER or CONFIG_MEMCG should be enabled, but
on 4.14 there is no lmk driver so we rely on CONFIG_MEMCG.

Bug: 77736601
Change-Id: Iff24ac4ec903054cb2a9b858c09f01caeffc6d22
Signed-off-by: Alistair Strachan <astrachan@google.com>
2018-04-09 17:25:57 +00:00
android-build-team Robot
5a59d6c46e Snap for 4693202 from 84605754b2 to qt-release
Change-Id: I1f28dd1eeff2f922bcaf2d21ba8e7dff7206cb28
2018-03-31 09:30:50 +00:00
Greg Hackmann
84605754b2 Merge "android-4.14: replace CONFIG_DEBUG_RODATA with CONFIG_STRICT_KERNEL_RWX" am: d589b2ba94 am: 3ab40f5daf
am: f915a38d3f

Change-Id: Id57d3ca2bb769a6ea03907acd2d097f2eef779c6
2018-03-30 17:25:30 +00:00
Greg Hackmann
f915a38d3f Merge "android-4.14: replace CONFIG_DEBUG_RODATA with CONFIG_STRICT_KERNEL_RWX" am: d589b2ba94
am: 3ab40f5daf

Change-Id: I6dc14165165ff46a3aba6f9687c9fecf74cc1dcf
2018-03-30 16:44:40 +00:00
Greg Hackmann
3ab40f5daf Merge "android-4.14: replace CONFIG_DEBUG_RODATA with CONFIG_STRICT_KERNEL_RWX"
am: d589b2ba94

Change-Id: Ibb8326d0290c449f6d592931d25f099bb1add214
2018-03-30 16:39:38 +00:00
Treehugger Robot
d589b2ba94 Merge "android-4.14: replace CONFIG_DEBUG_RODATA with CONFIG_STRICT_KERNEL_RWX" 2018-03-30 16:28:05 +00:00
android-build-team Robot
4359e1b75b Snap for 4690345 from f337fb23e5 to qt-release
Change-Id: I316b6d824c883ba9b6f490704a222e17efc31d33
2018-03-30 09:31:11 +00:00
Dmitry Shmidt
f337fb23e5 android-3.18: Move OABI_COMPAT to base-arm.cfg am: 56df143493 am: 9d40d27264
am: f585089044

Change-Id: I337c92e2f7f49cb0a0bad8029b93e012f69a4fe4
2018-03-29 22:13:39 +00:00
Dmitry Shmidt
4725dc4ea1 android-4.4: Move OABI_COMPAT to base-arm.cfg am: 9fd08f364a am: 98e34264da
am: e74487c870

Change-Id: Ie45b54e63e3275fe3ed6824b90c106bcdda8bbaa
2018-03-29 21:35:11 +00:00
Dmitry Shmidt
f585089044 android-3.18: Move OABI_COMPAT to base-arm.cfg am: 56df143493
am: 9d40d27264

Change-Id: I7c47a406bd80c718a6f82bca022b8c6129d23473
2018-03-29 21:13:13 +00:00
Dmitry Shmidt
e74487c870 android-4.4: Move OABI_COMPAT to base-arm.cfg am: 9fd08f364a
am: 98e34264da

Change-Id: I4336db5a1c049b0749564ed28f9b1bfa319a3bbc
2018-03-29 21:11:31 +00:00
Dmitry Shmidt
9d40d27264 android-3.18: Move OABI_COMPAT to base-arm.cfg
am: 56df143493

Change-Id: I3c6bb20c2a48504b617ec39a873ba97f0110852d
2018-03-29 21:08:53 +00:00
Dmitry Shmidt
98e34264da android-4.4: Move OABI_COMPAT to base-arm.cfg
am: 9fd08f364a

Change-Id: Iaa40c6b96c80b63747efbd03b756fc6981c516e1
2018-03-29 21:06:30 +00:00
Greg Hackmann
375c1b660a android-4.14: replace CONFIG_DEBUG_RODATA with CONFIG_STRICT_KERNEL_RWX
This was renamed in 4.10 by 0f5bf6d0afe4 ("arch: Rename
CONFIG_DEBUG_RODATA and CONFIG_DEBUG_MODULE_RONX") in order to clarify
the option's importance.

Bug: 76186455
Test: grep -E STRICT_KERNEL_RWX -A 3 \
	android-4.14/Documentation/security/self-protection.rst
Change-Id: I6cc3356849c098c5f4c63a6d144440d6fee3c346
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2018-03-29 10:40:57 -07:00
Dmitry Shmidt
56df143493 android-3.18: Move OABI_COMPAT to base-arm.cfg
Bug: 76186455
Test: no tests

Change-Id: Icf7ea1041f25ecd19aa6258ece44477c1e9948e5
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2018-03-28 15:09:45 -07:00
Dmitry Shmidt
9fd08f364a android-4.4: Move OABI_COMPAT to base-arm.cfg
Bug: 76186455
Test: no tests

Change-Id: I8451eb5514ec7b70444021f9f281ce8730f191f5
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2018-03-28 15:06:55 -07:00
Jaekyun Seok
5605754f97 Remove INET_LRO & move OABI_COMPAT to base-arm.cfg am: a9eb2d2d34 am: 2899e0d0e5
am: 1ba25d9134

Change-Id: I2d6ca7ce76b69d43d0bd3257880c0792a32057e0
2018-03-27 20:01:42 +00:00
Jaekyun Seok
1ba25d9134 Remove INET_LRO & move OABI_COMPAT to base-arm.cfg am: a9eb2d2d34
am: 2899e0d0e5

Change-Id: I24ded27b6d4c0537f707b1dd472721d25fca082a
2018-03-27 19:40:58 +00:00
Jaekyun Seok
2899e0d0e5 Remove INET_LRO & move OABI_COMPAT to base-arm.cfg
am: a9eb2d2d34

Change-Id: I95a3e97dffac7b21cd3dd0a6335cbf9ce58f6471
2018-03-27 19:33:58 +00:00
Jaekyun Seok
a9eb2d2d34 Remove INET_LRO & move OABI_COMPAT to base-arm.cfg
Bug: 76186455
Test: no tests
Change-Id: I7e903748e3296acb6353afe834787195348c5784
2018-03-27 13:25:11 +09:00
android-build-team Robot
58dad0c715 Snap for 4610834 from 432aff48e2 to pi-release
Change-Id: I5eaae47b595307c55874e4d86477c941f7e3f349
2018-02-18 08:28:22 +00:00
Steve Muckle
432aff48e2 android-4.4: restore restriction on CONFIG_INET_LRO am: c248a95d1c am: 4ddffe688a
am: 5ecbb222d6

Change-Id: I46eb7021681fb24c0020569c60428f84770249a3
2018-02-16 19:52:33 +00:00
Steve Muckle
5ecbb222d6 android-4.4: restore restriction on CONFIG_INET_LRO am: c248a95d1c
am: 4ddffe688a

Change-Id: I290e70eaa3df59631f552a64141435b44e6c8fb8
2018-02-16 19:44:41 +00:00
Steve Muckle
4ddffe688a android-4.4: restore restriction on CONFIG_INET_LRO
am: c248a95d1c

Change-Id: I5753bb961fe8b35941024932eb23430c87c10369
2018-02-16 19:37:08 +00:00
Steve Muckle
c248a95d1c android-4.4: restore restriction on CONFIG_INET_LRO
LRO is known to cause problems in some packet forwarding scenarios.

Bug: 69631527
Bug: 63797177
Test: run vts-kernel -m VtsKernelConfig
Change-Id: I061cd82bc276921963932e739494579809c1bf5a
Signed-off-by: Steve Muckle <smuckle@google.com>
2018-02-13 11:25:15 -08:00
android-build-team Robot
1b424a5557 Snap for 4565898 from a7cda8fc77 to pi-release
Change-Id: I567cce0550660d0de5df9228f81b3c40da3a7f50
2018-01-25 09:06:40 +00:00
Dmitry Shmidt
a7cda8fc77 android-4.14: Initial version of configs am: cfe72a2573 am: 3d26bacf36
am: f1eb25af87

Change-Id: Ida0f24912d47b7dc91b80438a3d3916b11727a91
2018-01-25 02:56:14 +00:00
Dmitry Shmidt
f1eb25af87 android-4.14: Initial version of configs am: cfe72a2573
am: 3d26bacf36

Change-Id: I424c0054a56a37333ac0e7bd0109a6d8fddf6ce2
2018-01-25 02:54:43 +00:00
Dmitry Shmidt
3d26bacf36 android-4.14: Initial version of configs
am: cfe72a2573

Change-Id: Ib4bb1e5ea28ab3a1626bcd604d2813386904babf
2018-01-25 02:50:43 +00:00
Dmitry Shmidt
cfe72a2573 android-4.14: Initial version of configs
Bug: 72420439
Test: ARCH=arm64 ./scripts/kconfig/merge_config.sh
        configs/android-4.14/android-base.cfg
        configs/android-4.14/android-recommended.cfg
        configs/android-4.14/android-base-arm.cfg
        configs/android-4.14/android-base-arm64.cfg
        arch/arm64/configs/hikey_defconfig

Change-Id: Iee85d86d00b8740130fddc46117f156554984b0d
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2018-01-24 15:10:02 -08:00
gitbuildkicker
e9c17875dd merge in pi-release history after reset to master 2018-01-23 14:19:36 -08:00
gitbuildkicker
aee03cf561 merge in pi-release history after reset to master 2018-01-23 12:07:22 -08:00
android-build-team Robot
bc3f6d47c6 Snap for 4560043 from e446c5c1ab to pi-release
Change-Id: I3d3ece187d58b7df2bc18b03cbee96729594ae88
2018-01-23 08:26:22 +00:00
Steve Muckle
e446c5c1ab remove CONFIG_FB requirement am: 92e529f313 am: ec44bff68a
am: ded6b937c7

Change-Id: I425016b48a0927e8dc0da8f35a21b6156fbb85b0
2018-01-23 02:43:11 +00:00
Steve Muckle
ded6b937c7 remove CONFIG_FB requirement am: 92e529f313
am: ec44bff68a

Change-Id: Ib1bfeff56b536706a41b800c89f8bcfcf77a03d3
2018-01-23 02:28:36 +00:00
Steve Muckle
ec44bff68a remove CONFIG_FB requirement
am: 92e529f313

Change-Id: I8e33db1008052efc9851422b582a6b69bc77af57
2018-01-23 02:17:56 +00:00
Steve Muckle
92e529f313 remove CONFIG_FB requirement
CONFIG_FB is not strictly required by Android.

Bug: 70922431
Test: run vts-kernel -m VtsKernelConfig
Change-Id: I7152cc43669dea987754ad7398ec2277d29f33ec
2018-01-22 15:37:54 -08:00
android-build-team Robot
d3b7399c94 Snap for 4539010 from 62b1c76eff to pi-release
Change-Id: I699d1209194ef46a73f6c6035e5127944bb4e7ec
2018-01-11 08:51:10 +00:00
Jerry Zhang
62b1c76eff Move CONFIG_AIO to android-base. am: 4ed084e489 am: 9e1494765c
am: 06d0443cc4

Change-Id: Ia74b6d3c259926cad8f5f37a3b03b77c70407f07
2018-01-10 19:58:58 +00:00