Commit graph

47578 commits

Author SHA1 Message Date
Martin Stjernholm
ba01a4cc5b Merge changes from topic "runtime-ld-configs" am: d35c4ccc40 am: 00f2f79179
am: 432c4cd11f

Change-Id: Ia1a199a51a601e38180f44b18842b79b348d5bab
2019-01-23 10:00:01 -08:00
Martin Stjernholm
432c4cd11f Merge changes from topic "runtime-ld-configs" am: d35c4ccc40
am: 00f2f79179

Change-Id: Ibaf0f077792ce8511a0f0dbd2ded85c65b705be1
2019-01-23 09:40:06 -08:00
Martin Stjernholm
00f2f79179 Merge changes from topic "runtime-ld-configs"
am: d35c4ccc40

Change-Id: Ia2c3f76a24009b1857840203a02a912614472911
2019-01-23 09:21:41 -08:00
Mark Salyzyn
e3c5c86278 Merge changes I72aaf4d6,I420cb87c,Iab7c6cf7,Ic4388e20 am: 39624169e7 am: 6a47ef32db
am: d4dd92821d

Change-Id: Ia7bdb461c9157a510fcd113cb02b5b10f99c37d5
2019-01-23 09:08:21 -08:00
Martin Stjernholm
d35c4ccc40 Merge changes from topic "runtime-ld-configs"
* changes:
  Make libdexfile_external.so accessible from binaries and libraries in /system.
  The runtime namespace needs to be visible since libopenjdk is loaded through dlopen().
2019-01-23 17:03:12 +00:00
Mark Salyzyn
d4dd92821d Merge changes I72aaf4d6,I420cb87c,Iab7c6cf7,Ic4388e20 am: 39624169e7
am: 6a47ef32db

Change-Id: If9854b8854478e9354b6fa65abac4741e809b34b
2019-01-23 09:02:57 -08:00
Mark Salyzyn
6a47ef32db Merge changes I72aaf4d6,I420cb87c,Iab7c6cf7,Ic4388e20
am: 39624169e7

Change-Id: I7ffbe4123b13b1830c3e18727b21e1f21e131927
2019-01-23 08:55:19 -08:00
Wei Wang
70977f7556 [automerger skipped] lmkd: bump process priority and set to FOREGROUND group before kill am: 6f2198b33c -s ours
am: fa31b7ab46 -s ours
am skip reason: change_id Iae7aa35483eb0e8bbeccaa425559c6021c845ee1 with SHA1 2d95c10847 is in history

Change-Id: I1de78dfc910c912169f97fb74960de3d510f1c9b
2019-01-23 08:52:25 -08:00
Michael Groover
5f9db7dcf9 Merge "Notify framework on adb disconnect" 2019-01-23 16:47:48 +00: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
Wei Wang
fa31b7ab46 [automerger skipped] lmkd: bump process priority and set to FOREGROUND group before kill
am: 6f2198b33c -s ours
am skip reason: change_id Iae7aa35483eb0e8bbeccaa425559c6021c845ee1 with SHA1 2d95c10847 is in history

Change-Id: Ie6edfd5e201455c5b1e55a38ba88cdf72d9519fd
2019-01-23 08:38:30 -08:00
Martin Stjernholm
c02464ced9 Make libdexfile_external.so accessible from binaries and libraries in /system.
There are dependencies on libdexfile_external from some central libraries
that are widely used (b/123186083).

One example is vendor/bin/hw/android.hardware.media.omx@1.0-service, which
requries the link from "system" to "runtime" in the [vendor] section.

The direct dependants are libunwindstack and simpleperf, so it's enough to
link from namespaces containing /system/{lib,lib64,bin}.

Test: Flash and boot
Test: Flash and boot with Runtime APEX enabled (http://r.android.com/q/topic:art-move-libs-to-runtime-apex)
Bug: 123186083
Bug: 113373927
Change-Id: I081aa7392c875202acdaf1185c2ff28e17ac7e76
2019-01-23 15:45:59 +00:00
Nicolas Geoffray
119e95b3b6 Merge "Conscrypt should only link against bionic." am: 1cab2c6bec am: 31e937429c
am: 06710823aa

Change-Id: Ic884d79df46b625e78f1b0bda03a368322bcef50
2019-01-23 01:30:49 -08:00
Nicolas Geoffray
06710823aa Merge "Conscrypt should only link against bionic." am: 1cab2c6bec
am: 31e937429c

Change-Id: Ifdc863fc41d3d91d52746ac3a5387f35e6408c37
2019-01-23 01:22:40 -08: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
f0ae77fed4 Merge "meminfo: Pull ReadVmallocInfo() out of the SysMemInfo class." am: 62b80fa3ad am: 040367712d
am: e27fa052c9

Change-Id: I1ad27005ae3323557e72e098e7f5a6bc91a05e73
2019-01-22 21:33:39 -08:00
Sandeep Patil
e27fa052c9 Merge "meminfo: Pull ReadVmallocInfo() out of the SysMemInfo class." am: 62b80fa3ad
am: 040367712d

Change-Id: I5bcfcbe45ec965a1b0933416866a43b2c4ba0878
2019-01-22 21:29:17 -08: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
Wei Wang
6f2198b33c lmkd: bump process priority and set to FOREGROUND group before kill
This should help speed up reclaim memory.

Bug: 118468011
Bug: 121439388
Test: run mem-pressure with lmkd
Change-Id: Iae7aa35483eb0e8bbeccaa425559c6021c845ee1
Merged-In: Iae7aa35483eb0e8bbeccaa425559c6021c845ee1
2019-01-23 05:20:36 +00:00
Sandeep Patil
62b80fa3ad Merge "meminfo: Pull ReadVmallocInfo() out of the SysMemInfo class." 2019-01-23 05:17:16 +00:00
Josh Gao
f1a46b4f64 Merge "adb: win32: improve console output on Windows 10" am: 54d1e31c63 am: d2f6058806
am: abfe86b38e

Change-Id: I17fc33c284a63b036e5375e56847cb1f45a988d6
2019-01-22 20:59:38 -08:00
Josh Gao
cfac8a77f6 Merge "adb: win32: LinePrinter Unicode support" am: 89a6fdc4b3 am: 6a3c02be54
am: f26d2a23b7

Change-Id: I2694a87a15da94a71d7ae029127345505f6d3d44
2019-01-22 20:57:59 -08:00
Josh Gao
abfe86b38e Merge "adb: win32: improve console output on Windows 10" am: 54d1e31c63
am: d2f6058806

Change-Id: Iccfecbe31c202e8a65b3ac7517b7975e8b391868
2019-01-22 20:28:44 -08:00
Josh Gao
f26d2a23b7 Merge "adb: win32: LinePrinter Unicode support" am: 89a6fdc4b3
am: 6a3c02be54

Change-Id: I61a4b50036c2f34e0e632e80c901b1ac1a1762f9
2019-01-22 20:27:20 -08: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
37f5143ca5 Merge "fs_mgr: overlayfs: erofs is in staging" am: 932e77137c am: 7859d9c581
am: 91f70ccecd

Change-Id: I21b36d3682816205943b7f115fd66976d9855231
2019-01-22 17:43:01 -08:00
Mark Salyzyn
91f70ccecd Merge "fs_mgr: overlayfs: erofs is in staging" am: 932e77137c
am: 7859d9c581

Change-Id: I01b8848db10d40e531b6fc771d55f4b0c8d06088
2019-01-22 17:35:40 -08: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
Christian Wailes
007881b492 Merge "Added a new socket to Zygote init scripts." 2019-01-22 22:58:19 +00:00
Sandeep Patil
67d1d6687a Merge "meminfo: Add API to read pagemap for a vma within a process." am: 15a3a287f2 am: 8f688f5b2d
am: 7f9afd296e

Change-Id: I174123e24a20692357c58455afc36dea84d98c43
2019-01-22 14:36:09 -08:00
Sandeep Patil
7f9afd296e Merge "meminfo: Add API to read pagemap for a vma within a process." am: 15a3a287f2
am: 8f688f5b2d

Change-Id: I4af15538624a777472022ac7a941a69a55d21f7e
2019-01-22 14:27:47 -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
Suren Baghdasaryan
14a0970dd1 [automerger skipped] Merge changes from topic "move sched_policy functions" am: ca50ee91b5 am: e8b2ac49bb
am: 6738419e09 -s ours
am skip reason: change_id Icc052080e1bce46ce06f7264446950cab0490a95 with SHA1 634e884419 is in history

Change-Id: I80026ca51b85fa55a4051acdfca216da040a714d
2019-01-22 14:06:44 -08: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
6738419e09 Merge changes from topic "move sched_policy functions" am: ca50ee91b5
am: e8b2ac49bb

Change-Id: I9ba62bc4cce474b2a12af5a1035714ac9dd39703
2019-01-22 13:41:10 -08:00
David Anderson
ad7f110864 Merge "fiemap_writer: Add a progress notification." am: dec436438a am: 3b7f64d323
am: 7b69453737

Change-Id: I4e5218b13a57d9e48032d1078f8330a622a6b06b
2019-01-22 13:40:40 -08:00
Michael Groover
3857dead17 Notify framework on adb disconnect
Bug: 111656592
Test: atest AdbDebuggingManagerTest
Change-Id: I84f0b076799b0628663fde1a14609bc71c5a9ed3
2019-01-22 13:12:32 -08:00
David Anderson
7b69453737 Merge "fiemap_writer: Add a progress notification." am: dec436438a
am: 3b7f64d323

Change-Id: Ia827d8dc68460779ad4e0946aa5d7b67043ef7ed
2019-01-22 13:06:39 -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