Commit Graph

34176 Commits

Author SHA1 Message Date
Tom Cherry d165de95da Merge changes from topic 'ext4_encryption_flag' am: 5be05733c2
am: 5a6226929e

Change-Id: I648c45ea99d2b8695c337bbda7b0a6e45598e67e
2017-07-14 23:14:06 +00:00
Tom Cherry 5a6226929e Merge changes from topic 'ext4_encryption_flag'
am: 5be05733c2

Change-Id: I242f679bb96f9ae71b624db4cbcb54dda5be5ee4
2017-07-14 23:11:43 +00:00
Tom Cherry 5be05733c2 Merge changes from topic 'ext4_encryption_flag'
* changes:
  fs_mgr: set ext4 encryption flag with tune2fs when needed
  fs_mgr: refactor pre-mount logic into prepare_fs_for_mount()
2017-07-14 23:06:30 +00:00
Mark Salyzyn a62497c189 Merge "rootdir: record last build signature and kernel version" am: 91a17a41f6
am: 97e90c6bb8

Change-Id: I82fe22a93914d53b04a6f75e26d0f718235aaf2a
2017-07-14 21:24:20 +00:00
Mark Salyzyn 97e90c6bb8 Merge "rootdir: record last build signature and kernel version"
am: 91a17a41f6

Change-Id: I86afacf1540ad02f5e70c08f39a5c76f98d47c4e
2017-07-14 21:20:22 +00:00
Treehugger Robot 91a17a41f6 Merge "rootdir: record last build signature and kernel version" 2017-07-14 21:15:36 +00:00
Mark Salyzyn 93394034a2 rootdir: record last build signature and kernel version
Rotate /default.prop and /proc/version into /data/misc/recovery/
as an aid in determining the vintage of the LAST_LOGCAT and
LAST_DMESG in the bugreport collection.

Signed-off-by: Mark Salyzyn <salyzyn@google.com>
Test: manually confirm content rotation through reboots
Bug: 62793047
Change-Id: Ibbe546c76041f20e308e58e5548939afac75db97
2017-07-14 11:39:14 -07:00
Bowgo Tsai 776c67b4d5 Merge "fs_mgr: trim the terminating '\0' when reading from device tree" am: b76158d56a
am: 3205cd6cc4

Change-Id: I81cb7e1f3bf6043bfc2f8383ba1bc6929d9785c8
2017-07-14 05:21:02 +00:00
Bowgo Tsai 3205cd6cc4 Merge "fs_mgr: trim the terminating '\0' when reading from device tree"
am: b76158d56a

Change-Id: I8498667cfdd266827a936a9e9a0bac50dc9699f4
2017-07-14 05:18:04 +00:00
Treehugger Robot b76158d56a Merge "fs_mgr: trim the terminating '\0' when reading from device tree" 2017-07-14 05:11:00 +00:00
Josh Gao 914e341741 Merge "crasher: add a case that leaks until OOM-kill." am: f610d6db82
am: 0cb3d254a2

Change-Id: Icd55ccdf17c0449315f943a7109c14141a235f65
2017-07-14 00:00:04 +00:00
Josh Gao 0cb3d254a2 Merge "crasher: add a case that leaks until OOM-kill."
am: f610d6db82

Change-Id: I475d8ca2e2959b66e19f71545e14f75f1ca8c202
2017-07-13 23:56:08 +00:00
Treehugger Robot f610d6db82 Merge "crasher: add a case that leaks until OOM-kill." 2017-07-13 23:46:59 +00:00
Christopher Ferris 224087844b Merge "Move tools to separate directory." am: d312abe7c0
am: 3588f6a5fb

Change-Id: Ic9ad5d71681e5dc30af94faa4cc969095fe6e8ae
2017-07-13 22:48:28 +00:00
Christopher Ferris 3588f6a5fb Merge "Move tools to separate directory."
am: d312abe7c0

Change-Id: I824bf8bb7598383c9ffa4da8b9ffc1c7ded04268
2017-07-13 22:45:29 +00:00
Christopher Ferris d312abe7c0 Merge "Move tools to separate directory." 2017-07-13 22:41:55 +00:00
Josh Gao 399b4ee21e crasher: add a case that leaks until OOM-kill.
Bug: http://b/63143027
Test: adb shell crasher leak
Change-Id: I6e4105972ef3d86430d0f332938f5fd33ebae100
2017-07-13 14:00:26 -07:00
Christopher Ferris b5d7a87512 Move tools to separate directory.
Bug: 23762183

Test: Ran unit tests, ran new tools.
Change-Id: Icc7cbb4102a68042f4683d6dd622f21bc5e74deb
2017-07-13 13:20:10 -07:00
Colin Cross d5a42720a5 Merge "libmemunreachable: track kernel binder references" am: 454285dfcc
am: 028aca2d06

Change-Id: Ic4ba34dbe304a462928ff132d4897a26cef14c57
2017-07-13 20:04:10 +00:00
Colin Cross 028aca2d06 Merge "libmemunreachable: track kernel binder references"
am: 454285dfcc

Change-Id: I2c30d94b6e628a637f59c353d862dc16cdf528e0
2017-07-13 19:55:22 +00:00
Colin Cross 454285dfcc Merge "libmemunreachable: track kernel binder references" 2017-07-13 19:41:26 +00:00
Steven Moreland 72180d4361 Merge "Add vendor_available to liblog_headers." am: f42d02830d -s ours
am: f2a35db75c

Change-Id: I29ff70be1034b5ea43a23b02fab038a94512e68d
2017-07-13 17:42:38 +00:00
Steven Moreland f2a35db75c Merge "Add vendor_available to liblog_headers."
am: f42d02830d  -s ours

Change-Id: Iba32e2a5ed864b0655428964bf09df60149e5184
2017-07-13 17:39:39 +00:00
Christopher Ferris 55ed67cdaf Merge "A few cleanups." am: 0c22c5646e
am: 35f2bf43a7

Change-Id: I6efc7c8201c57932d6cb5ff4f5f474592e6d01db
2017-07-13 17:02:26 +00:00
Steven Moreland f16148c00b Merge "libutils: liblog export headers" am: 5607f36e01 -s ours
am: 83999b3df8

Change-Id: I8cdc21b4e822f0cbef6346b766ac219fc5f084ed
2017-07-13 17:02:09 +00:00
Christopher Ferris 35f2bf43a7 Merge "A few cleanups."
am: 0c22c5646e

Change-Id: I557f9348d53d6c64efba4e25c7fa46970ca5e7a0
2017-07-13 16:59:56 +00:00
Steven Moreland 83999b3df8 Merge "libutils: liblog export headers"
am: 5607f36e01  -s ours

Change-Id: I63edd403d5e56136b7516798ae8c044bdbbfd448
2017-07-13 16:59:37 +00:00
Bowgo Tsai f559655912 fs_mgr: trim the terminating '\0' when reading from device tree
Bug: 63637343
Test: boot device
Change-Id: I35ead1ad852493f7f92bdb6c87617fde57b3b0be
2017-07-13 15:11:16 +08:00
Colin Cross f572b91c4f libmemunreachable: track kernel binder references
The kernel can hold references to binder objects that have no userspace
references.  Allow libmemunreachable to call into libbinder and
libhwbinder to get lists of kernel references.  Use undefined weak
symbols so that libmemunreachable will continue to work in processes
that do not have libbinder.

Test: memunreachable_binder_test
Bug: 28275695
Change-Id: I9eae73f2a51a49a7025ffe6309ccdc2693a2391b
2017-07-12 14:59:11 -07:00
Treehugger Robot f42d02830d Merge "Add vendor_available to liblog_headers." 2017-07-12 21:07:26 +00:00
Steven Moreland c30f248cd4 Add vendor_available to liblog_headers.
Renamed NDK headers to "liblog_ndk_headers"
(these names aren't used anywhere).

libutils_headers now properly export liblog_headers.

Test: with BOARD_VNDK_VERSION=current
Merged-In: I3a85385f588b84393c57fd6d1bcac620f708f0f1
Change-Id: I3a85385f588b84393c57fd6d1bcac620f708f0f1
2017-07-12 12:59:30 -07:00
Christopher Ferris 0c22c5646e Merge "A few cleanups." 2017-07-12 17:44:03 +00:00
Treehugger Robot 5607f36e01 Merge "libutils: liblog export headers" 2017-07-12 05:42:10 +00:00
Christopher Ferris f6d5431273 A few cleanups.
- Cleanup the blueprint file a bit.
- Fix the formatting in DwarfMemoryTest.cpp.
- Fix the misnamed test MemoryBuffer.cpp to MemoryBufferTest.cpp.
- Add a function to find the location of the test files so it's not
  necessary to run the test in the same directory as the test files.

Bug: 23762183

Test: Builds and unit tests pass.
Change-Id: I5666972bd01f14b8ee47c518f1840f8aeb7fd08b
2017-07-11 19:10:34 -07:00
Yifan Hong 3ba4e0a589 Merge "Remove old LOG_EVENT_* code from libsysutils" am: 5aee3ff22a
am: 67e0b810bc

Change-Id: Ie93622cff757ea136fc7659b72271b55a359bb96
2017-07-12 00:22:18 +00:00
Yifan Hong 67e0b810bc Merge "Remove old LOG_EVENT_* code from libsysutils"
am: 5aee3ff22a

Change-Id: Iff831a155516d988a51b13a7ea173e27496de29c
2017-07-12 00:19:17 +00:00
Treehugger Robot 5aee3ff22a Merge "Remove old LOG_EVENT_* code from libsysutils" 2017-07-12 00:11:50 +00:00
Baligh Uddin 1f18c34ed1 Merge "Fix mips build." am: 97ba18ed7f
am: 36f46cd915

Change-Id: I526fc8af06ca8fbeadc17dc518542a3a5f21230c
2017-07-11 23:17:06 +00:00
Baligh Uddin 36f46cd915 Merge "Fix mips build."
am: 97ba18ed7f

Change-Id: I6e5693234966ce8307376796fc9ceb6d2396a9b6
2017-07-11 23:13:44 +00:00
Baligh Uddin 97ba18ed7f Merge "Fix mips build." 2017-07-11 23:07:43 +00:00
Yifan Hong 087f3b74af Remove old LOG_EVENT_* code from libsysutils
As a side effect, this change fixes
libbsysutils => liblog dependencies. LOG_EVENT_*
macros are not defined for liblog.vendor.

Test: BOARD_VNDK_VERSION=current mma
Bug: 33241851
Bug: 63034227
Change-Id: I3df700d97481ec9aa59cf1796da1e991af28bdf5
2017-07-11 15:14:26 -07:00
Christopher Ferris 3517fe0413 Fix mips build.
Don't build for mips, none of this is supported on mips.

Bug: 23762183

Test: Mips build passes.
Change-Id: Iba89466a7bc13856f8fcd59ca0708a30f417b6c6
2017-07-11 15:06:19 -07:00
Robert Benea 43c6c844de Merge "Use mem cgroups in libprocessgroup if they're available" am: 3c7f566495
am: 92ad7c02d4

Change-Id: I08d156810741228e30aa0d4fb8f981c1ecb447f4
2017-07-11 22:04:09 +00:00
Robert Benea 92ad7c02d4 Merge "Use mem cgroups in libprocessgroup if they're available"
am: 3c7f566495

Change-Id: I7b50c83c5ba053faf6be62200570738744dd1e7b
2017-07-11 22:01:09 +00:00
Robert Benea 3c7f566495 Merge "Use mem cgroups in libprocessgroup if they're available" 2017-07-11 21:52:39 +00:00
Christopher Ferris 06386fe0a2 Merge "Add full support for initing registers." am: 1add237c8d
am: 66c61b545a

Change-Id: Ia7efe41ec442bda112cd928be3d5bd9051e6da9f
2017-07-11 21:26:42 +00:00
Christopher Ferris 66c61b545a Merge "Add full support for initing registers."
am: 1add237c8d

Change-Id: Ib9bb8b413ddc0ad411506a5343817f2af5177b1e
2017-07-11 21:23:13 +00:00
Christopher Ferris 1add237c8d Merge "Add full support for initing registers." 2017-07-11 21:17:48 +00:00
Robert Benea 3280e48847 Use mem cgroups in libprocessgroup if they're available
Use mem cgroups if the kernel is built with CONFIG_MEMCG=y,
additionally add system group.

test: verified on both kernel with/without memcg enabled
Change-Id: Ia2ae89efa3905e9da68fa77adac1225c667864d1
2017-07-11 12:48:10 -07:00
Christopher Ferris 2a25c4aab5 Add full support for initing registers.
- Fixes a few bugs in untested functionality.
- Add tests for the way the register handling code is used.
- Fix a few tests that were not reaping child processes.

Bug: 23762183

Test: Ran unit tests on host (32 bit and 64 bit).
Test: Ran unit tests on angler (32 bit and 64 bit).
Change-Id: I573d6617b4f1561f6e8494d7213c52086d112d97
2017-07-11 12:15:54 -07:00