Peter Collingbourne
bf90eac006
Merge "Introduce additional service options for controlling memory cgroups."
...
am: 166ae693d4
2018-11-01 11:09:48 -07:00
Peter Collingbourne
166ae693d4
Merge "Introduce additional service options for controlling memory cgroups."
2018-11-01 17:55:34 +00:00
Dan Willemsen
0baa61fa1a
Merge "Convert more modules to Android.bp"
...
am: 2141f9a6c4
2018-11-01 09:11:40 -07:00
Treehugger Robot
2141f9a6c4
Merge "Convert more modules to Android.bp"
2018-11-01 16:02:27 +00:00
Justin Yun
db8c37ef38
Merge "Make fs_mgr_access() available to user build"
...
am: 8da39ef62a
2018-11-01 08:59:00 -07:00
Treehugger Robot
8da39ef62a
Merge "Make fs_mgr_access() available to user build"
2018-11-01 15:44:30 +00:00
Justin Yun
818ff63f09
Make fs_mgr_access() available to user build
...
fs_mgr_access() is used by a public function that is avaliable to
user build.
Test: build fs_mgr for user variant.
Change-Id: I1ec977fa1920add7db3023b181a9a7666b0890b5
2018-11-01 17:25:39 +09:00
Dan Willemsen
3e963f9df7
Convert more modules to Android.bp
...
Test: cd system/core; mma
Test: check for mkbootfs in build artifacts
Test: out/host/linux-x86/nativetest64/libcrypto_utils_test/libcrypto_utils_test
Test: out/host/linux-x86/nativetest64/libnativebridge-tests/*_test
Change-Id: I71141bd85f052d5d86763a8b79b219cc4c46aafb
2018-10-31 21:53:37 -07:00
Justin Yun
84bbc22fe8
Merge "Mount vendor overlay from the system partition"
...
am: 312339167e
2018-10-31 21:32:03 -07:00
Treehugger Robot
312339167e
Merge "Mount vendor overlay from the system partition"
2018-11-01 04:24:33 +00:00
Yabin Cui
9091ab6fc4
Merge "libprocinfo: provide MapInfo structure for reading maps."
...
am: cc684eb085
2018-10-31 19:56:05 -07:00
Treehugger Robot
cc684eb085
Merge "libprocinfo: provide MapInfo structure for reading maps."
2018-11-01 02:46:47 +00:00
George Burgess IV
20b6048e1b
Merge "liblog: Fix memory leaks"
...
am: 91c47309a0
2018-10-31 19:23:32 -07:00
Treehugger Robot
91c47309a0
Merge "liblog: Fix memory leaks"
2018-11-01 02:11:31 +00:00
Justin Yun
6bab0a9c23
Mount vendor overlay from the system partition
...
Using overlayfs, the system partition may provide files for older
version of vendor partitions by overlaying on the vendor partition.
Directories in /system/vendor_overlay will be overlaid on the
directories in /vendor to override existing files or provide new
files.
This feature works only if the kernel support overlayfs and has a
patch for override_creds. Otherwise, no-op.
Bug: 114679254
Test: Build and boot: nothing affected without overlayfs, or
vendor file is overrided with overlayfs
Change-Id: Iff3a308945299034123ba7bcb40dc787e102730e
2018-11-01 10:26:12 +09:00
Peter Collingbourne
d7157c22af
Introduce additional service options for controlling memory cgroups.
...
The memcg.limit_percent option can be used to limit the cgroup's
max RSS to the given value as a percentage of the device's physical
memory. The memcg.limit_property option specifies the name of a
property that can be used to control the cgroup's max RSS. These
new options correspond to the arguments to the limitProcessMemory
function in frameworks/av/media/libmedia/MediaUtils.cpp; this will
allow us to add these options to the rc files for the programs that
call this function and then remove the callers in a later change.
There is also a change in semantics: the memcg.* options now have
an effect on all devices which support memory cgroups, not just
those with ro.config.low_ram or ro.config.per_app_memcg set to true.
This change also brings the semantics in line with the documentation,
so it looks like the previous semantics were unintentional.
Change-Id: I9495826de6e477b952e23866743b5fa600adcacb
Bug: 118642754
2018-10-31 17:09:59 -07:00
Yabin Cui
5c716e36fe
Merge "libbase: support char parameter in StartsWith/EndsWith."
...
am: bb3e479268
2018-10-31 11:49:57 -07:00
Yabin Cui
bb3e479268
Merge "libbase: support char parameter in StartsWith/EndsWith."
2018-10-31 18:42:33 +00:00
Mark Salyzyn
43f24ab1b2
Merge "fs_mgr: overlayfs takes const std::vector<const fstab_rec*>&"
...
am: 1206850289
2018-10-31 11:17:04 -07:00
Treehugger Robot
1206850289
Merge "fs_mgr: overlayfs takes const std::vector<const fstab_rec*>&"
2018-10-31 17:52:18 +00:00
Mark Salyzyn
a762e007c5
fs_mgr: overlayfs takes const std::vector<const fstab_rec*>&
...
fs_mgr_overlayfs_mount_all() and fs_mgr_overlayfs_required_devices()
to also take const std::vector<const fstab_rec*>& argument.
Bug: 117933812
Test: manual adb-remount-test.sh
Change-Id: Ic72fcca1fe32c311ff3f903c7275e6f7dfba46a7
2018-10-31 14:42:44 +00:00
Josh Gao
ffd3922fd4
Merge "debuggerd_fallback: fix fd leak."
...
am: e26b8b0181
2018-10-30 23:07:55 -07:00
Treehugger Robot
e26b8b0181
Merge "debuggerd_fallback: fix fd leak."
2018-10-31 06:05:28 +00:00
Bo Hu
87363ef509
Merge "adb: print emulator console output"
...
am: 3e3797a947
2018-10-30 21:45:28 -07:00
Bo Hu
3e3797a947
Merge "adb: print emulator console output"
2018-10-31 04:28:17 +00:00
Yabin Cui
0fe48f943d
libprocinfo: provide MapInfo structure for reading maps.
...
Bug: none
Test: run libprocinfo_test.
Change-Id: I4d3c0f3012e91571aef7ebf4b154df1c9c5addc2
2018-10-30 17:36:09 -07:00
Yabin Cui
a656b98634
libbase: support char parameter in StartsWith/EndsWith.
...
Bug: 117568547
Test: run libbase_test.
Change-Id: I5a6a412733c594f5a116f333b8e091d2d9f60e06
2018-10-30 17:20:50 -07:00
Josh Gao
08163cb032
debuggerd_fallback: fix fd leak.
...
Previously, when we received simultaneous dump requests, we were CASing
a file descriptor value into a variable, and then failing to close it
if the CAS failed.
Bug: http://b/118412443
Test: debuggerd_test
Change-Id: I075c35a239426002eb9416da3d268c3d1a18e9d2
2018-10-30 15:33:58 -07:00
bohu
09faa66006
adb: print emulator console output
...
It is very helpful to see the output of the following adb command:
adb emu <emulator commands...>
Change-Id: I7905370fb955de4d457a323a7e9e780aaca5d45e
2018-10-30 14:36:33 -07:00
Christopher Ferris
6d0726b7e0
Merge "Update for v4.19 kernel headers."
...
am: e94eb5140c
2018-10-30 12:26:22 -07:00
Christopher Ferris
e94eb5140c
Merge "Update for v4.19 kernel headers."
2018-10-30 19:11:33 +00:00
Victor Hsieh
7d018cc347
Merge "adb install-multiple to also accept .fsv_sig"
...
am: b10f63526a
2018-10-30 11:46:19 -07:00
Treehugger Robot
b10f63526a
Merge "adb install-multiple to also accept .fsv_sig"
2018-10-30 18:26:32 +00:00
Christopher Ferris
bc2a0e3049
Merge "Verify that the elf matches the expected arch."
...
am: b31badf70f
2018-10-30 09:25:13 -07:00
Christopher Ferris
461baeb44e
Update for v4.19 kernel headers.
...
Add new trap type TRAP_UNK.
Test: Unit tests pass.
Change-Id: I2b9cb8ddd1d993aa4819831aaca34f8da4286b52
(cherry picked from commit ead88bc88e
2018-10-30 09:22:12 -07:00
Christopher Ferris
b31badf70f
Merge "Verify that the elf matches the expected arch."
2018-10-30 16:16:45 +00:00
Christopher Ferris
4568f4bc0f
Verify that the elf matches the expected arch.
...
To avoid a case where a malicious app might try and trick the system to
create an elf and register object that mismatches, always verify that they
are the same arch.
Test: Ran unit tests.
Change-Id: I66978e9e02f8e4f396856912e7019528ead4838e
2018-10-29 18:08:09 -07:00
Tom Cherry
1f09cc5fb3
Merge "fs_mgr: fix userdebug/user argument type mismatch"
...
am: 1d0ee36de7
2018-10-29 17:36:46 -07:00
Tom Cherry
1d0ee36de7
Merge "fs_mgr: fix userdebug/user argument type mismatch"
2018-10-30 00:14:56 +00:00
Tom Cherry
8dcae262d7
fs_mgr: fix userdebug/user argument type mismatch
...
Test: build
Change-Id: I394bd14ef987d3b763869e05fdbf1ed32153ce59
2018-10-29 17:08:23 -07:00
Victor Hsieh
02ef4bb190
adb install-multiple to also accept .fsv_sig
...
.fsv_sig will be fs-verity signature in PKCS#7 format.
Test: adb install-multiple foo.apk foo.apk.fsv_sig
Bug: 112037636
Change-Id: I4a9b2203334d4974602c7f138222ade1aa319ccb
2018-10-29 16:55:06 -07:00
Mark Salyzyn
d5514f3d6a
Merge "fs_mgr: fs_mgr_has_shared_blocks() needs logical blk_device"
...
am: b7d9b6a995
2018-10-29 15:31:56 -07:00
Treehugger Robot
b7d9b6a995
Merge "fs_mgr: fs_mgr_has_shared_blocks() needs logical blk_device"
2018-10-29 22:18:37 +00:00
David Anderson
bfd0291447
Merge "liblp: Allow the super partition to span multiple block devices."
...
am: 2cda71c9f6
2018-10-29 14:08:43 -07:00
David Anderson
2cda71c9f6
Merge "liblp: Allow the super partition to span multiple block devices."
2018-10-29 20:57:06 +00:00
Suren Baghdasaryan
46d6d26c6c
Merge "lmkd: Cleanup unused code for killing processes in bulk"
...
am: d04b38b0e5
2018-10-29 13:31:26 -07:00
Suren Baghdasaryan
4d8a9caf30
Merge "lmkd: retune rate at which processes are killed"
...
am: d5eaeffcf3
2018-10-29 13:30:42 -07:00
Suren Baghdasaryan
d04b38b0e5
Merge "lmkd: Cleanup unused code for killing processes in bulk"
2018-10-29 20:09:29 +00:00
Suren Baghdasaryan
d5eaeffcf3
Merge "lmkd: retune rate at which processes are killed"
2018-10-29 20:09:04 +00:00
Eric Biggers
bc3c6f670a
Merge "init: use libfscrypt for file-based encryption setup"
...
am: 82c6ba74e2
2018-10-29 10:32:33 -07:00
