Commit graph

45081 commits

Author SHA1 Message Date
Tom Cherry
c6b683e109 Merge "Add a version script for liblog for the platform"
am: 23a40c7b16

Change-Id: I1d8441680d7b4132fc9f45489d25957b7414b487
2019-01-22 11:51:35 -08:00
Tom Cherry
23a40c7b16 Merge "Add a version script for liblog for the platform" 2019-01-22 19:45:05 +00:00
Florian Mayer
d11e5688c1 Merge "Remove unused jit_debug unique_ptr."
am: fc1c2f56ab

Change-Id: Ie044d58c44424d139b41310b9d958ed52482a7be
2019-01-22 11:27:50 -08:00
Tri Vo
a530c8c57b Merge "init: load /product selinux mapping file"
am: 7ca2c565b0

Change-Id: I112ff612d0643968252dd0987057ac1bd3ed3ebd
2019-01-22 11:23:12 -08:00
Treehugger Robot
fc1c2f56ab Merge "Remove unused jit_debug unique_ptr." 2019-01-22 19:10:44 +00:00
Sandeep Patil
b811cee38b Merge "libmemtrack: Remove libpagemap dependency."
am: c8903eebb3

Change-Id: I5138de03c8a00f1e4f1ade4394c87c65bb176a23
2019-01-22 10:52:22 -08:00
Tri Vo
7ca2c565b0 Merge "init: load /product selinux mapping file" 2019-01-22 18:49:21 +00:00
Treehugger Robot
c8903eebb3 Merge "libmemtrack: Remove libpagemap dependency." 2019-01-22 18:27:01 +00:00
Tom Cherry
007db6bf44 Merge "Revert "do not start shutdown animation from init""
am: 5d7439ff5b

Change-Id: I03a51577a9551b8bbcbc431e563bd65720ef3f3f
2019-01-22 09:26:29 -08:00
Tom Cherry
5d7439ff5b Merge "Revert "do not start shutdown animation from init"" 2019-01-22 17:16:32 +00:00
Florian Mayer
33d4bb3d88 Remove unused jit_debug unique_ptr.
Change-Id: I39ed4fdd5695fefff235b6c40d83d9780fc5b75b
2019-01-22 15:56:34 +00:00
Nicolas Geoffray
af8e980ed1 Merge "Revert "Revert "Introduce conscrypt linker namespace."""
am: 4d30819263

Change-Id: Id1eee73e7f736965771767a0612fd3318f12305f
2019-01-22 06:33:29 -08:00
Nicolas Geoffray
4d30819263 Merge "Revert "Revert "Introduce conscrypt linker namespace.""" 2019-01-22 14:27:13 +00:00
Nicolas Geoffray
890e3bf4e7 Revert "Revert "Introduce conscrypt linker namespace.""
This reverts commit 5701a47685.

Bug: 123185917
Test: CtsJdwpTestCases
Test: android.signature.cts.api.killswitch_debug_class

Reason for revert: Fixed CtsJdwpTestCases and KillSwitchTest.

Change-Id: I6a074038a4e974875d68ca6a371f6a87ad48bce9
2019-01-22 09:15:22 +00:00
Nicolas Geoffray
f495d92287 Merge "Add 'media' namespace in ld.config.txt"
am: 7fa20386c3

Change-Id: Ieee082530822ce8ffe98b2e5d6fda8aa2267056e
2019-01-22 01:05:51 -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
7fa20386c3 Merge "Add 'media' namespace in ld.config.txt" 2019-01-22 08:51:10 +00: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
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
380995adc7 libmemtrack: Remove libpagemap dependency.
While at it convert the old memtrack_test.c to cpp.
Bug: 111694435
Test: memtrack_test

Change-Id: If297d70cf05b330c578dfabc934fc368d362cc70
Signed-off-by: Sandeep Patil <sspatil@google.com>
2019-01-21 13:47:27 -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
Dongwon Kang
c19263bcd0 Add 'media' namespace in ld.config.txt
Test: build & boot & atest MediaPlayer2Test
Bug: 112766913, Bug: 123185917
Change-Id: I6bccc5d767c108af5e71ad5cf64a1d4d48227761
2019-01-21 11:23:04 -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
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
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
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
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
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
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
Logan Chien
6bee7c52df Merge "Add libc_headers to header_libs for libpropertyinfoparser"
am: 0dd8a9824f

Change-Id: Iac70fb16c5fb9ec66b566955177518005a2819a2
2019-01-18 18:45:09 -08:00
Logan Chien
0dd8a9824f Merge "Add libc_headers to header_libs for libpropertyinfoparser" 2019-01-19 02:34:34 +00:00
Christopher Ferris
2cb6c40c2b Merge "Add caching of build id in MapInfo object."
am: b26b07d845

Change-Id: I8773da5fa8b0be2b450465c5c1602eb6d497d46d
2019-01-18 16:53:29 -08:00
Sudheer Shanka
5e4c507abd Merge "Reland "Create new mount directory /mnt/runtime/full.""
am: c39ed35d82

Change-Id: I8699ebaa37b5578e198ae268083b93fd7fbbc5f0
2019-01-18 16:52:35 -08:00