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
Sandeep Patil
62b80fa3ad
Merge "meminfo: Pull ReadVmallocInfo() out of the SysMemInfo class."
2019-01-23 05:17:16 +00: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
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
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
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
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
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
85554226f4
Merge "Add a version script for liblog for the platform" am: 23a40c7b16
...
am: c6b683e109
Change-Id: Iafc1a92ac6ae61f7ee5de24cc80ae64bc80c4ce7
2019-01-22 11:59:05 -08:00
Florian Mayer
9851902fa8
Merge "Remove unused jit_debug unique_ptr." am: fc1c2f56ab
...
am: d11e5688c1
Change-Id: I745b0ce86139257a6474c542cebac9d0cf412aff
2019-01-22 11:52:57 -08: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
Tri Vo
5103d8fb63
Merge "init: load /product selinux mapping file" am: 7ca2c565b0
...
am: a530c8c57b
Change-Id: I0d5bba0fd83ea0610358b489429672a9be71a1fd
2019-01-22 11:49:56 -08:00
Sandeep Patil
8178c03541
Merge "libmemtrack: Remove libpagemap dependency." am: c8903eebb3
...
am: b811cee38b
Change-Id: Ieb91b4ee4737412cad27eb20cb6e8089044f495b
2019-01-22 11:47:30 -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
e518ed049f
Merge "Revert "do not start shutdown animation from init"" am: 5d7439ff5b
...
am: 007db6bf44
Change-Id: Id41a3db434144dc4b10c544462ff8fe13169cf07
2019-01-22 09:30:37 -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
fd6a05085c
Merge "Revert "Revert "Introduce conscrypt linker namespace.""" am: 4d30819263
...
am: af8e980ed1
Change-Id: I3f97eb1327c527060fb4734d3d94adbc5efdbbd3
2019-01-22 06:37:37 -08: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
bc60897aec
Merge "Add 'media' namespace in ld.config.txt" am: 7fa20386c3
...
am: f495d92287
Change-Id: I1f1fb3a04d2acc89a5c9035dbe8c4290e09842f7
2019-01-22 01:18:02 -08: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
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
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