Commit graph

45113 commits

Author SHA1 Message Date
Mark Salyzyn
6a47ef32db Merge changes I72aaf4d6,I420cb87c,Iab7c6cf7,Ic4388e20
am: 39624169e7

Change-Id: I7ffbe4123b13b1830c3e18727b21e1f21e131927
2019-01-23 08:55:19 -08:00
Treehugger Robot
39624169e7 Merge changes I72aaf4d6,I420cb87c,Iab7c6cf7,Ic4388e20
* changes:
  fs_mgr: overlay: support non-DAP A/B devices
  fs_mgr: overlayfs: test: check for existence of userspace fastboot
  fs_mgr: overlayfs: test: check for ext4 dedupe needing overlay
  fs_mgr: overlayfs: validate that kernel supports scratch filesystem
2019-01-23 16:39:22 +00:00
Mark Salyzyn
264b7dfa5e fs_mgr: overlay: support non-DAP A/B devices
Loosen some tests and borrow logic from retrofit Dynamic Android
Partitions (DAP) A/B devices.  In non-DAP A/B device case
/mnt/scratch is used, backed by the system other partition.

Tested on taimen with CONFIG_OVERLAY_FS added to its pre 4.6 kernel,
and BOARD_EXT4_SHARE_DUP_BLOCKS := true added to board config. Also
tested on a retrofit DAP A/B device and an untouched taimen.

Test: adb_remount_test.sh
Bug: 120448575
Change-Id: I72aaf4d68db1c3ac380aba425346ab6443cadad3
2019-01-23 16:38:33 +00:00
Nicolas Geoffray
31e937429c Merge "Conscrypt should only link against bionic."
am: 1cab2c6bec

Change-Id: I8ee133fed8bbf6f87c90680da91ffa018c49fcba
2019-01-23 01:18:47 -08:00
Nicolas Geoffray
1cab2c6bec Merge "Conscrypt should only link against bionic." 2019-01-23 09:08:42 +00:00
Sandeep Patil
040367712d Merge "meminfo: Pull ReadVmallocInfo() out of the SysMemInfo class."
am: 62b80fa3ad

Change-Id: Iefc36a462b0315cdd17b2a9cfd01bb783223d786
2019-01-22 21:23:56 -08:00
Sandeep Patil
62b80fa3ad Merge "meminfo: Pull ReadVmallocInfo() out of the SysMemInfo class." 2019-01-23 05:17:16 +00:00
Josh Gao
d2f6058806 Merge "adb: win32: improve console output on Windows 10"
am: 54d1e31c63

Change-Id: Ifd13cba3d4c2735670fcbb998743fd58edcc4497
2019-01-22 20:09:55 -08:00
Josh Gao
6a3c02be54 Merge "adb: win32: LinePrinter Unicode support"
am: 89a6fdc4b3

Change-Id: I58892c14ee45fc00f1f8573349f4225df6e8b2cc
2019-01-22 20:06:23 -08:00
Josh Gao
54d1e31c63 Merge "adb: win32: improve console output on Windows 10" 2019-01-23 03:59:27 +00:00
Josh Gao
89a6fdc4b3 Merge "adb: win32: LinePrinter Unicode support" 2019-01-23 03:47:21 +00:00
Mark Salyzyn
7859d9c581 Merge "fs_mgr: overlayfs: erofs is in staging"
am: 932e77137c

Change-Id: If57b0b977b6e25c1eb846b848fff167999bcb543
2019-01-22 17:09:40 -08:00
Treehugger Robot
932e77137c Merge "fs_mgr: overlayfs: erofs is in staging" 2019-01-23 00:36:17 +00:00
Mark Salyzyn
52490faabe fs_mgr: overlayfs: test: check for existence of userspace fastboot
If there is no userspace fastboot, then overlayfs has a corner case
bug where overlay content is not wiped when the partition is flashed.
We will report a warning instead.

This is done to reduce the flakiness of the test results as we do not
intend to fix this specific corner case in the short term.  We would
require to record a sha representing the flash image, and the risks
were evaluated as too high of an impact on libavb to add interfaces
to expose the signatures, especially at first stage mount time.  All
new devices must support Dynamic Android Partitions (DAP), which
means they all have support for userspace fastboot, it will be
considered a misconfiguration and thus the position is we will not
fix this issue and only use this test adjustment to deal with legacy
products.  If a legacy non-DAP product wishes to close the issue
today, they must supply a user space fastboot.

Test: adb-remount-test.sh
Bug: 109821005
Bug: 123079041
Change-Id: I420cb87c19e3e184a974dfc373fb17c097d4858f
2019-01-22 15:28:38 -08:00
Mark Salyzyn
3fe0a8164d fs_mgr: overlayfs: test: check for ext4 dedupe needing overlay
Check if any system partition looks like it has ext dedupe or
rather shared_blocks feature enabled, if so then we expect
overlayfs to kick in.  We do this to deal with any flakiness
in the test when right-sizing is not applied to the platform.

Minor: older devices mounted persist to /persist.

Test: adb-remount-test.sh
Bug: 109821005
Bug: 123079041
Change-Id: Iab7c6cf7f24f2c446aeb149e3f65d6793a42c6ea
2019-01-22 15:28:23 -08:00
Mark Salyzyn
89b88b4e2d fs_mgr: overlayfs: validate that kernel supports scratch filesystem
Check for /sys/fs/<fs_type> existence to confirm kernel has
the file system type available.

Test: adb-remount-test.sh
Bug: 109821005
Bug: 123079041
Change-Id: Ic4388e2044bccea8b8edc7762d4ac9b3047206ac
2019-01-22 15:28:11 -08:00
Sandeep Patil
8f688f5b2d Merge "meminfo: Add API to read pagemap for a vma within a process."
am: 15a3a287f2

Change-Id: I3dba7766030dfebd5732f6586fdcbde7245385fd
2019-01-22 14:21:15 -08:00
Sandeep Patil
15a3a287f2 Merge "meminfo: Add API to read pagemap for a vma within a process." 2019-01-22 22:08:24 +00:00
Sandeep Patil
e04680d141 meminfo: Pull ReadVmallocInfo() out of the SysMemInfo class.
There is no need for the vmalloc reader to be in the sysmeminfo object.
The caller has to create the SysMemInfo object for no reason right now.

Bug: 111694435
Test: libmeminfo_test 1

Change-Id: I263c08c169ea6caf2221bfb915b26ef3c0b1c20c
Signed-off-by: Sandeep Patil <sspatil@google.com>
2019-01-22 14:06:01 -08:00
Suren Baghdasaryan
e8b2ac49bb Merge changes from topic "move sched_policy functions"
am: ca50ee91b5

Change-Id: I92310f7dd60384b95c056c98cdc616857ebcd1ec
2019-01-22 13:03:07 -08:00
Suren Baghdasaryan
ca50ee91b5 Merge changes from topic "move sched_policy functions"
* changes:
  Add dependencies on libprocessgroup for sched_policy users
  libcutils: Move sched_policy functions into libprocessgroup
  Add libprocessgroup into VNDK
2019-01-22 20:58:16 +00:00
David Anderson
3b7f64d323 Merge "fiemap_writer: Add a progress notification."
am: dec436438a

Change-Id: I580c5f8efd0e3fe8147f782fa0bfdc5c895153bb
2019-01-22 12:52:16 -08:00
David Anderson
dec436438a Merge "fiemap_writer: Add a progress notification." 2019-01-22 20:16:46 +00:00
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
Suren Baghdasaryan
02843339f9 Add dependencies on libprocessgroup for sched_policy users
After moving sched_policy functions into libprocessgroup its users require
additional dependency and inclusion of sched_policy_ctrl.h header.

Exempt-From-Owner-Approval: janitorial

Bug: 111307099
Test: builds, boots

Merged-In: Icc052080e1bce46ce06f7264446950cab0490a95
Change-Id: Icc052080e1bce46ce06f7264446950cab0490a95
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
2019-01-22 18:19:45 +00:00
Suren Baghdasaryan
facd40d0e1 libcutils: Move sched_policy functions into libprocessgroup
Move functions operating on cgroups from sched_policy.h in libcutils
into sched_policy_ctrl.h under libprocessgroup. This consolidates
cgroup-related functionality inside libprocessgroup.

Bug: 111307099
Test: builds, boots

Merged-In: Iba75f33281162b889989214d0325a5973d53ed2d
Change-Id: Iba75f33281162b889989214d0325a5973d53ed2d
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
2019-01-22 18:18:48 +00:00
Suren Baghdasaryan
dad4749731 Add libprocessgroup into VNDK
Include libprocessgroup into vndk in preparation for sched_policy
functions to be moved into it.

Bug: 111307099
Test: builds, boots
Merged-In: I09a528cac8821df3201c2428b151fd2eaece3ccb
Change-Id: I09a528cac8821df3201c2428b151fd2eaece3ccb
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
2019-01-22 18:18:22 +00:00
Mark Salyzyn
c11f8e55b1 fs_mgr: overlayfs: erofs is in staging
erofs is in upstream staging and in 4.19, and we see some Android
partners considering it as an option instead of squashfs.

However, squashfs and erofs filesystems are always 100% full, so
we can safely remove the string checking instead and just rely on
the statvfs call.  We will provide lip-service to our support in
comment only.

This does _not_ mean we support the decision by our partners to use
erofs, as we have not evaluated the performance.

Test: adb_remount_test.sh
Bug: 109821005
Change-Id: I80ea3a33b9da6684ee95489132bc8a88b2310ac8
2019-01-22 10:09:08 -08: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
88bdf80d17 Conscrypt should only link against bionic.
Also remove useless code in native_loader.cpp

Test: m
Change-Id: Id176256cc36fa32d3f722e1443429cb9fbec05f2
2019-01-22 15:32:23 +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
cbc8f123d8 meminfo: Add API to read pagemap for a vma within a process.
.. and make sure we have some helper methods exposed to the clients
to do some basic checks for the pagemap values. For example, to check
if the page is present or swapped.

Bug: 111694435
Test: libmeminfo_test 1 --gtest_filter=ValidateProcMemInfo.TestPageMap
Test: libmeminfo_test 1

Change-Id: Ic6ae91f4214b42346f3d0b54164a43ac79d5ade1
Signed-off-by: Sandeep Patil <sspatil@google.com>
2019-01-21 17:24:54 -08:00