Commit Graph

34061 Commits

Author SHA1 Message Date
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
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
Tom Cherry 7ff0b008f7 Merge "Move Timer from init to libbase"
am: 896297b2ef

Change-Id: I1990fa013fa1fe69a61711faf032db45216f6f47
2017-07-10 18:28:25 +00:00
Tom Cherry 896297b2ef Merge "Move Timer from init to libbase" 2017-07-10 18:23:29 +00:00
Tom Cherry ede0d53850 Move Timer from init to libbase
Test: boot bullhead
Test: new libbase unit tests

Change-Id: Ic398a1daa1fe92c10ea7bc1e6ac3f781cee9a5b5
2017-07-10 09:28:24 -07:00
Ian Elliott cbe556ee62 Merge "Use void instead of no parameters in 2 function declarations."
am: 11b91e7c28

Change-Id: Ie41c3cbf8c6017994d3728c638fc85c55df3ec94
2017-07-10 12:09:43 +00:00
Ian Elliott 11b91e7c28 Merge "Use void instead of no parameters in 2 function declarations." 2017-07-10 12:01:51 +00:00
Tim Murray 7f857bb9ff Merge "Revert "Use mem cgroups in libprocessgroup if they're available""
am: e8a75e8f76

Change-Id: Iec01b90ae7d49d1eaf4a6e0c5324749a358db5d6
2017-07-08 01:45:50 +00:00
Treehugger Robot e8a75e8f76 Merge "Revert "Use mem cgroups in libprocessgroup if they're available"" 2017-07-08 01:41:19 +00:00
Tim Murray fc10e3d5e5 Revert "Use mem cgroups in libprocessgroup if they're available"
This reverts commit 32375c2328.

bug 63164307

Change-Id: I3336bbf7c2f3297b231c5b0a1ef538faff9513fd
2017-07-08 00:04:42 +00:00
Ian Elliott 58e06c5f94 Use void instead of no parameters in 2 function declarations.
In compiling some code with a picky "Android.mk" file, it is not happy
with a function declaration that looks like:

    void foo();

It requires:

    void foo(void);

This commit changes that for 2 functions in "log.h".

Test: Build both Android and the code with a picky "Android.mk".
Change-Id: Icd624df34db57e642fe6b1c7da77be9b05936936
2017-07-07 16:11:32 -06:00
Christopher Ferris 793ffcbf20 Merge "Add missing test files to compile."
am: 32ac9bfd09

Change-Id: Iaf2ebb9f3d39b2e99724b2bed0512b4f0bb3da3c
2017-07-07 21:33:49 +00:00
Christopher Ferris 32ac9bfd09 Merge "Add missing test files to compile." 2017-07-07 21:26:30 +00:00
Christopher Ferris 9744fb2b54 Add missing test files to compile.
Bug: 23762183

Test: Ran unit tests.
Change-Id: I8ac43517231d88c68c288800d8ed286daa57bce1
2017-07-07 12:25:23 -07:00
Christopher Ferris f5b374a8b3 Merge "Init .gnu_debugdata in GetElf()."
am: 2d07f72961

Change-Id: I485c6211dfef3b0468dcdd9cf8cc9347b2563231
2017-07-07 19:01:11 +00:00
Christopher Ferris 2d07f72961 Merge "Init .gnu_debugdata in GetElf()." 2017-07-07 18:56:56 +00:00
Android Build Merger (Role) 200d376b75 Merge "Merge "bootstat.cpp: update help message for --record_boot_complete" am: f444650d0d" into stage-aosp-master 2017-07-07 17:43:37 +00:00
Yongqin Liu b1cef7e70b Merge "bootstat.cpp: update help message for --record_boot_complete"
am: f444650d0d

Change-Id: I63801d806f3ab3bc2977ec74ad003f137899c34a
2017-07-07 17:43:27 +00:00
Yongqin Liu efe27cd2f6 Merge "bootstat.cpp: update help message for --record_boot_complete"
am: f444650d0d

Change-Id: Ifecefb1d52188d8a82208097f67302c91e30c93e
2017-07-07 17:43:19 +00:00
Treehugger Robot f444650d0d Merge "bootstat.cpp: update help message for --record_boot_complete" 2017-07-07 17:27:05 +00:00
Yongqin Liu 78b2b94d1d bootstat.cpp: update help message for --record_boot_complete
add description about --record_boot_complete in the help

Test: manually with HiKey

Change-Id: I521d6f5b9d98113c006fc6ab146b6c353ce2390c
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
2017-07-07 15:27:10 +00:00
Colin Cross 2abcc0a178 Merge "Add test config for memunreachable_test"
am: a6bee4a29e

Change-Id: I90ae7480d84a77143f63d0f5527392a9b0021bb7
2017-07-07 04:17:59 +00:00
Treehugger Robot a6bee4a29e Merge "Add test config for memunreachable_test" 2017-07-07 04:11:22 +00:00
Colin Cross 55665c3c97 Merge "Remove reference to deleted gzip module"
am: 48d610ab18

Change-Id: I5be86c2fb388df0e651c089040adc9be2580f4d6
2017-07-07 01:44:05 +00:00
Treehugger Robot 48d610ab18 Merge "Remove reference to deleted gzip module" 2017-07-07 01:34:40 +00:00
Colin Cross b9e74ba400 Add test config for memunreachable_test
Test: none
Change-Id: Ieb297a2fcece6365a074cd470b3ca56e2baea926
2017-07-07 01:07:05 +00:00
Android Build Merger (Role) b3c418e847 Merge "Merge "Move libnativebridge headers into the module." am: 508e0b8b34" into stage-aosp-master 2017-07-06 23:47:59 +00:00
Steven Moreland a931c8aee5 Merge "Move libnativebridge headers into the module."
am: 508e0b8b34

Change-Id: Ifb3e84ed0a059f10efe8e25595387a17c2b0ed46
2017-07-06 23:47:31 +00:00
Steven Moreland 1921ab7c0e Merge "Move libnativebridge headers into the module."
am: 508e0b8b34

Change-Id: I9135de5cbda05c9b4b686b0c6dda26c2d561d31e
2017-07-06 23:46:57 +00:00
Treehugger Robot 508e0b8b34 Merge "Move libnativebridge headers into the module." 2017-07-06 23:36:34 +00:00
Andreas Gampe 10e80f3715 Merge "System/core: Remove include/ziparchive"
am: ae590fe723

Change-Id: I396b3cd0e642b3d65a1e0771a4ed8aec64128922
2017-07-06 22:56:34 +00:00
Treehugger Robot ae590fe723 Merge "System/core: Remove include/ziparchive" 2017-07-06 22:42:39 +00:00
Colin Cross 73c2ef4b87 Remove reference to deleted gzip module
The gzip module was removed and replaced with an implementation in
toybox.  Remove the required modules reference.

Bug: 63400769
Change-Id: I032d7ddc59105b3c6fb87084983266655772756a
Test: m -j checkbuild
2017-07-06 22:33:22 +00:00
Steven Moreland b2b88e35ea Move libnativebridge headers into the module.
Test: links
Change-Id: I2e19d1ba7845b4b3d3fee934fcb1c90151fd7192
2017-07-06 11:23:16 -07:00
Andreas Gampe bf4029cdfb Merge "Libziparchive: Export headers in defaults"
am: c31963b5c2

Change-Id: Ic57c6374d94828d245b3e89ea6ec669707e32262
2017-07-06 06:57:06 +00:00
Treehugger Robot c31963b5c2 Merge "Libziparchive: Export headers in defaults" 2017-07-06 06:51:29 +00:00
Andreas Gampe d201b292fd System/core: Remove include/ziparchive
Remove the now unnecessary link.

Partially reverts commit cdf7ff8e20.

Bug: 37342627
Test: m
Change-Id: Ia44df234923c798618d7dc79d8f9f9432fbfada9
2017-07-05 22:03:44 -07:00
Andreas Gampe a10a7e7114 Libziparchive: Export headers in defaults
libziparchive-host needs to include the headers correctly, too.

Bug: 37342627
Test: mmma system/core/libziparchive
Change-Id: I88a6d38ff9e494273040f9b913c71bccdda117ad
2017-07-05 22:03:44 -07:00
Tom Cherry 11d5611ba5 Merge "init: add info logs in first stage mount if we have to poll"
am: 6a9d56775f

Change-Id: I7948db4cf1d6af6f4e6d0ddb2a2788f62317126f
2017-07-06 04:48:38 +00:00
Treehugger Robot 6a9d56775f Merge "init: add info logs in first stage mount if we have to poll" 2017-07-06 04:46:05 +00:00
Jinguang Dong 694985721f Merge "fs_mgr: Adding logs when failing to wait for a device file"
am: 4ca2a30368

Change-Id: I19ba38a596527a4544437d126c80123381b065b4
2017-07-06 04:20:55 +00:00
Treehugger Robot 4ca2a30368 Merge "fs_mgr: Adding logs when failing to wait for a device file" 2017-07-06 04:19:00 +00:00
Android Build Merger (Role) 3752ae8474 Merge "Merge "ueventd: don't double fork firmware handlers" am: 0f4fb5497a" into stage-aosp-master 2017-07-06 02:11:15 +00:00
Tom Cherry 1f30993247 Merge "ueventd: don't double fork firmware handlers"
am: 0f4fb5497a

Change-Id: I4a5957d18e3a934213170279f59b3ec8c0f85090
2017-07-06 02:11:03 +00:00
Tom Cherry e944b7e0a4 Merge "ueventd: don't double fork firmware handlers"
am: 0f4fb5497a

Change-Id: I2a40b76e937853fd2f1eed61cc0fe4f6fa465ba2
2017-07-06 02:10:57 +00:00
Tom Cherry 0f4fb5497a Merge "ueventd: don't double fork firmware handlers" 2017-07-06 02:02:33 +00:00
Jinguang Dong 9d344969b0 fs_mgr: Adding logs when failing to wait for a device file
During mount operations, fs_mgr_wait_for_file() is invoked to
ensure the device file exists before starting to mount it. Adding
logs when the wait fails and also skip mounting as it won't be
successful. Also merge fs_mgr_test_access() and wait_for_file()
as fs_mgr_wait_for_file().

Test: Boot device and manually trigger the timeout issue
Test: Check and confirm whether timeout log info is inside ksmg.

Change-Id: Ide6d7fdca41e03e169e4400f91b7dea327985aaf
2017-07-06 09:51:02 +08:00
Keun-young Park a4ad5d0328 Merge "add "shutdown critical" to service"
am: b3915d113d

Change-Id: I25b6f42478efda7077e00141042a427245393d28
2017-07-06 00:46:31 +00:00
Bowgo Tsai 328b56585e Merge "fs_mgr: allow no verity metadata when the device is unlocked."
am: cd0c2d8962

Change-Id: Icebfb3c34b3c2878c4015f36dafe893c577b40c9
2017-07-06 00:46:09 +00:00