Commit graph

47480 commits

Author SHA1 Message Date
Nicolas Geoffray
1cd3d41313 Merge "Delay zygote startup until after the Runtime APEX has been mounted." am: 876cd75748 am: ce0abc4d93
am: 3639043906

Change-Id: Ifb657a5725de5092d1202b32d4e0288433882726
2019-01-22 01:18:39 -08:00
Nicolas Geoffray
3639043906 Merge "Delay zygote startup until after the Runtime APEX has been mounted." am: 876cd75748
am: ce0abc4d93

Change-Id: Ie9145c1c94ebb05b5d23873803bb2e72f1c1732e
2019-01-22 01:11:41 -08:00
Nicolas Geoffray
ce0abc4d93 Merge "Delay zygote startup until after the Runtime APEX has been mounted."
am: 876cd75748

Change-Id: I0796f5d0a34c12dcea9fdfd719d6284dc0653a67
2019-01-22 01:00:50 -08:00
Nicolas Geoffray
876cd75748 Merge "Delay zygote startup until after the Runtime APEX has been mounted." 2019-01-22 08:43:55 +00:00
Leo Liou
b2844f08dd Merge "fs_mgr: set ext4 fsverity feature bit" am: 2eca761ee5 am: 1ec76699b9
am: 7674d1686b

Change-Id: I550fec3b893c9c697c1c61b35a976c102cb23e13
2019-01-21 23:03:22 -08:00
Leo Liou
7674d1686b Merge "fs_mgr: set ext4 fsverity feature bit" am: 2eca761ee5
am: 1ec76699b9

Change-Id: Iba7f1a3bee1830193775139ba69cea854d65ae9e
2019-01-21 22:54:50 -08:00
Leo Liou
1ec76699b9 Merge "fs_mgr: set ext4 fsverity feature bit"
am: 2eca761ee5

Change-Id: I9e4b8240d0270011ea4e2fb06c48ade93b89c3ff
2019-01-21 22:50:36 -08:00
Treehugger Robot
2eca761ee5 Merge "fs_mgr: set ext4 fsverity feature bit" 2019-01-22 06:39:59 +00:00
Leo Liou
0b721d3dd9 fs_mgr: set ext4 fsverity feature bit
It supports a new feature "fsverity" for ext4 file-system. When someone
adds a mount option "fsverity" to fstab file, fsmgr will use tune2fs to
enable fsverity feature if kernel support.

Bug: 117437571
Test: bootable for phone projects
Change-Id: Icf35715a2f71c430468daaafcde497f8cfe9a18d
2019-01-22 12:22:13 +08:00
Sandeep Patil
e3892dd864 Merge "meminfo/tools: Enable all libmeminfo based tools" am: 51e990358f am: 5fe810d675
am: 95fbef425f

Change-Id: I94b3f6dcd23cb81a298dd39cbf014e7590e617d2
2019-01-21 13:51:27 -08:00
Sandeep Patil
95fbef425f Merge "meminfo/tools: Enable all libmeminfo based tools" am: 51e990358f
am: 5fe810d675

Change-Id: I27cbb806be35b66776bb46bd1b930cca7d05636f
2019-01-21 13:47:19 -08:00
Sandeep Patil
5fe810d675 Merge "meminfo/tools: Enable all libmeminfo based tools"
am: 51e990358f

Change-Id: If9997a3ae6410830ff73e2650468ad3c8de8f7f1
2019-01-21 13:44:13 -08:00
Treehugger Robot
51e990358f Merge "meminfo/tools: Enable all libmeminfo based tools" 2019-01-21 21:35:18 +00:00
Tom Cherry
8772ef0c31 Merge "fs_mgr: add dvander@ to OWNERS" am: 582a81cbe8 am: c06f2d0895
am: 6ce44c72cf

Change-Id: Ie63073311fe072dec7d9b9f5236d3aa8c9177fb2
2019-01-21 11:05:35 -08:00
Tom Cherry
6ce44c72cf Merge "fs_mgr: add dvander@ to OWNERS" am: 582a81cbe8
am: c06f2d0895

Change-Id: I7f9b4cf7a8287fd12916663044c68751b29a220b
2019-01-21 10:55:14 -08:00
Leo Liou
dc88ddaec8 Merge "zram: add bitfield to FstabEntry" am: 9c833f1e28 am: 267eba1cde
am: e57265b226

Change-Id: I150847e3ca321a0123df5b7777e67586e4c6d610
2019-01-21 10:49:30 -08:00
Leo Liou
e57265b226 Merge "zram: add bitfield to FstabEntry" am: 9c833f1e28
am: 267eba1cde

Change-Id: I1c14c2fc59bdfe656ad404796df8d397e2486706
2019-01-21 10:45:23 -08:00
Tom Cherry
c06f2d0895 Merge "fs_mgr: add dvander@ to OWNERS"
am: 582a81cbe8

Change-Id: I3d7b32fd83b33b042db3763d4be2358fe14e08d5
2019-01-21 10:45:15 -08:00
Leo Liou
267eba1cde Merge "zram: add bitfield to FstabEntry"
am: 9c833f1e28

Change-Id: I49ace0b57dbe71c3b11945e76a9af1ff9b805c2c
2019-01-21 10:39:15 -08:00
Tom Cherry
582a81cbe8 Merge "fs_mgr: add dvander@ to OWNERS" 2019-01-21 18:35:25 +00:00
Treehugger Robot
9c833f1e28 Merge "zram: add bitfield to FstabEntry" 2019-01-21 18:31:00 +00:00
Nicolas Geoffray
97f0c48712 Merge "Revert "Introduce conscrypt linker namespace."" am: e606e00042 am: 3326da5bb7
am: 9ea6ac833b

Change-Id: I50c9696c6049a4183da388dd659fe87e88982a4d
2019-01-21 09:44:38 -08:00
Nicolas Geoffray
9ea6ac833b Merge "Revert "Introduce conscrypt linker namespace."" am: e606e00042
am: 3326da5bb7

Change-Id: I8ca367616fa84260ec64fceeecfb975e13d20b98
2019-01-21 09:40:28 -08:00
Nicolas Geoffray
3326da5bb7 Merge "Revert "Introduce conscrypt linker namespace.""
am: e606e00042

Change-Id: If644c8cb83478ac12f218ac0faa90ebd32686b72
2019-01-21 09:36:17 -08:00
Nicolas Geoffray
e606e00042 Merge "Revert "Introduce conscrypt linker namespace."" 2019-01-21 17:25:17 +00:00
Nicolas Geoffray
5701a47685 Revert "Introduce conscrypt linker namespace."
This reverts commit 67a09e5791.
Exempt-From-Owner-Approval: Fixes P0 failures.

Bug: 123185917


Reason for revert: media namespace needs to be introduced.

Change-Id: I0c28798a3143c1e627278c3a908207e670171416
2019-01-21 17:23:31 +00:00
Nicolas Geoffray
95cb5d8303 Merge "Introduce conscrypt linker namespace." am: 8922048185 am: 70df103b96
am: a3370d6bd4

Change-Id: I87d60938dc7c32865a6ea8aad4dd3514450e14c5
2019-01-21 04:21:41 -08:00
Nicolas Geoffray
a3370d6bd4 Merge "Introduce conscrypt linker namespace." am: 8922048185
am: 70df103b96

Change-Id: Ia6e176b806fc4754e8617c255e00d693c753873d
2019-01-21 04:17:33 -08:00
Nicolas Geoffray
70df103b96 Merge "Introduce conscrypt linker namespace."
am: 8922048185

Change-Id: I84ca06e5e6f2a0134976a0906f2f99339f916d66
2019-01-21 04:14:24 -08:00
Nicolas Geoffray
8922048185 Merge "Introduce conscrypt linker namespace." 2019-01-21 12:05:33 +00:00
Nicolas Geoffray
67a09e5791 Introduce conscrypt linker namespace.
And have the linker translate a java library path from an apex
to a linker namespace.

Bug: 122874359
Test: m, boots, gtest, run-test, CtsJdwpTests
Change-Id: I216c3509c45589d28acdac068aec53877aeb104a
Exempt-From-Owner-Approval: Carrying Jiyong's +2
2019-01-21 12:05:13 +00:00
Martin Stjernholm
440efa5796 Delay zygote startup until after the Runtime APEX has been mounted.
It depends on libdexfile_external, libnative{bridge,helper,loader} and
libart(d), which are provided by the Runtime APEX.

Test: flash & boot
Test: atest CtsJdwpTestCases
Bug: 113373927
Change-Id: I0df99f444e892c47a5f06bd1bcf5d184defb4517
2019-01-21 10:55:31 +00:00
Nicolas Geoffray
52d358d554 Merge "Pass the Java caller's location to OpenNativeLibrary." am: ad6a5c565c am: 52ee675449
am: 18d145c45c

Change-Id: I15128358d665f645dba4042bde36b95e36ca4be0
2019-01-20 06:37:58 -08:00
Nicolas Geoffray
18d145c45c Merge "Pass the Java caller's location to OpenNativeLibrary." am: ad6a5c565c
am: 52ee675449

Change-Id: I48eefb2caba241706c76fe8f7e83b9c9fd2654c4
2019-01-20 06:22:10 -08:00
Nicolas Geoffray
52ee675449 Merge "Pass the Java caller's location to OpenNativeLibrary."
am: ad6a5c565c

Change-Id: I98285f658fe9ccef8c7b58051bac54bf1869eb6d
2019-01-20 06:09:10 -08:00
Nicolas Geoffray
ad6a5c565c Merge "Pass the Java caller's location to OpenNativeLibrary." 2019-01-20 13:58:49 +00:00
Ramon Pantin
aed10af53d Merge "Fixed a few minor nits in liblp" am: 7909d650bd am: 19bb15407a
am: 48daeba896

Change-Id: Iad9608e2095579eace9e88b30612f24924b9ae3d
2019-01-20 00:27:00 -08:00
Ramon Pantin
48daeba896 Merge "Fixed a few minor nits in liblp" am: 7909d650bd
am: 19bb15407a

Change-Id: I333be062bbad56136ca631d30f78f936d62cb3f4
2019-01-20 00:21:52 -08:00
Ramon Pantin
19bb15407a Merge "Fixed a few minor nits in liblp"
am: 7909d650bd

Change-Id: Ie9efb729b07713c414769cf0be24fbb801deae84
2019-01-20 00:18:05 -08:00
Treehugger Robot
7909d650bd Merge "Fixed a few minor nits in liblp" 2019-01-20 07:55:47 +00:00
Yabin Cui
76ecff4767 Merge "base: support optional flags in android::base::Pipe." am: 0182f71d96 am: 77ddc89bb0
am: 96dc1c7d98

Change-Id: I2c7c21a852a62ce3693f8a7591437dc32180c8ff
2019-01-19 17:17:48 -08:00
Yabin Cui
96dc1c7d98 Merge "base: support optional flags in android::base::Pipe." am: 0182f71d96
am: 77ddc89bb0

Change-Id: I2c20d702e9a4167c3fb66ad9fd8cd72959947864
2019-01-19 17:13:37 -08:00
Yabin Cui
77ddc89bb0 Merge "base: support optional flags in android::base::Pipe."
am: 0182f71d96

Change-Id: Ieed51a0c0225f9435c5e0e8e6c4abd9c13bf6b57
2019-01-19 17:09:29 -08:00
Yabin Cui
0182f71d96 Merge "base: support optional flags in android::base::Pipe." 2019-01-20 01:02:46 +00:00
Sandeep Patil
d8e322c225 meminfo/tools: Enable all libmeminfo based tools
Enables procrank, procmem, librank and showmap.
Only showmap gets built into the default builds.

Bug: 111694435
Test: builds
Test: showmap exists in final builds

Change-Id: Ib5901aa2bd4ccc6aa3d02915fda92f8320651315
Signed-off-by: Sandeep Patil <sspatil@google.com>
2019-01-19 13:12:09 -08:00
Leo Liou
4809b20270 zram: add bitfield to FstabEntry
For fstab flag control, add the bitfields for zram definition.

Bug: 122659265
Test: none
Change-Id: I68c9a8c9ab0b218f6ca933316e85effe14402202
2019-01-19 17:02:40 +00:00
Dan Willemsen
621cff03f7 Merge "Remove LOCAL_MODULE_TAGS := debug" am: 763bac7826 am: 67d1b381f9
am: 151bc1c2de

Change-Id: Ic9b215432453476130a0d45b4e4387c7159de9de
2019-01-19 00:14:30 -08:00
Dan Willemsen
151bc1c2de Merge "Remove LOCAL_MODULE_TAGS := debug" am: 763bac7826
am: 67d1b381f9

Change-Id: I5424815da6e04e4f36e09f896069dd90e002a7fa
2019-01-19 00:06:58 -08:00
Dan Willemsen
67d1b381f9 Merge "Remove LOCAL_MODULE_TAGS := debug"
am: 763bac7826

Change-Id: Id952d793b49593c193c47a7ef530fd048e0573e1
2019-01-18 23:50:10 -08:00
Dan Willemsen
763bac7826 Merge "Remove LOCAL_MODULE_TAGS := debug" 2019-01-19 07:39:56 +00:00