summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove PenaltyExcessCharacter from clang-formats.Christopher Ferris2018-07-192-2/+0
| | | | | | | | | This option can cause the number of columns to exceed 100. Bug: 111310533 Test: NA Change-Id: Icbda1ba9afbf68a29f2a13082df6ca65af3c0f37
* Merge "init: Add warning in init first stage mount"Treehugger Robot2018-06-131-0/+14
|\
| * init: Add warning in init first stage mountWei Wang2018-06-131-0/+14
| | | | | | | | | | | | | | | | | | init need find required devices and it some times takes a long time due to rogue drivers. Add a warning if the timing is longer than 50ms. Bug: 80494921 Test: Reboot Change-Id: I8f937d7ca7127dc89ed76bb6e5f1781459d5c94a
* | Merge "logd: make behavior more consistent across builds."Elliott Hughes2018-06-131-21/+16
|\ \
| * | logd: make behavior more consistent across builds.Elliott Hughes2018-06-131-21/+16
| |/ | | | | | | | | | | Bug: 110127913 Test: boots Change-Id: I0c1efacfb5ac0407e896ddde0bcc63927edc0525
* | Merge "libsparse: Add method to create sparse file from buffer"Treehugger Robot2018-06-132-39/+185
|\ \ | |/ |/|
| * libsparse: Add method to create sparse file from bufferJerry Zhang2018-06-072-39/+185
| | | | | | | | | | | | | | | | | | | | | | | | Refactor elements of sparse file parsing that depend on an fd into SparseFileSource class, then create implementations using both fd and buffer. Add sparse_file_read_buf which reads the given buffer into a sparse file cookie without copying. Test: flash system with sparse images Bug: 78793464 Change-Id: Ice6c8e1ff075d6867e070f80fcf5aa4f530a1b95
* | Merge "logd: Stop calling prctl(PR_SET_KEEPCAPS, 1)"Treehugger Robot2018-06-131-5/+0
|\ \
| * | logd: Stop calling prctl(PR_SET_KEEPCAPS, 1)Luis Hector Chavez2018-06-131-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change removes the call to prctl(PR_SET_KEEPCAPS, 1), because now that logd is being run with ambient capabilities, init will set the KEEP_CAPS / KEEP_CAPS_LOCKED securebits. Bug: 110127913 Test: liblog-unit-tests, logd-unit-tests, logcat-unit-tests (on an aosp_sailfish-userdebug) Change-Id: I72b6a49c5cd1552085f9ad44cb19a7333a13eeea
* | | Merge "Fix handling of load bias values."Christopher Ferris2018-06-1340-898/+1752
|\ \ \
| * | | Fix handling of load bias values.Christopher Ferris2018-06-1140-898/+1752
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It turns out that for the dwarf information, if a FDE indicates it's pc relative, then pc has to be incremented by the load bias. If not, then it should not be incremented. Previously, the code always subtracted load bias values from pcs, and assumed that all fdes were incremented by load bias values. The new code actually reads the fdes and adjusted the pcs in the fde and in the eh frame hdr so that load bias values are already handled properly. In addition, add dumping of arm exidx values in unwind_reg_info. This allowed verifying that the debug frame in those elf files was being handled properly. Added a new unit test that only has a debug frame that has a non-zero load bias and has fde entries that do not have pc relative encoding. Fix a couple of other small bugs. Bug: 109824792 Test: All libbacktrace/libunwindstack unit tests pass. Test: Ran ART 137-cfi test and 004-ThreadStress. Test: Verify that displaying the fde start and end pc actually match the Test: real data for fde that have pc relative set, and that don't. Test: Verified that the unwind information for arm exidx matches the Test: debug frame data. Change-Id: I707555286b5cb05df9f25489e8c5ede753cfe0fb
* | | | Merge "libcutils: add OWNERS."Treehugger Robot2018-06-121-0/+4
|\ \ \ \
| * | | | libcutils: add OWNERS.Elliott Hughes2018-06-121-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: N/A Test: N/A Change-Id: Ia147e1dc9511810cd86a463861db3d3d7fedab9b
* | | | | Merge "ueventd: fix extraneous 'Invalid section' error"Tom Cherry2018-06-121-12/+12
|\ \ \ \ \
| * | | | | ueventd: fix extraneous 'Invalid section' errorTom Cherry2018-06-121-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When adding a new error case for host_init_parser, I didn't handle the individual line callbacks used for ueventd correctly. This change fixes that. Test: bullhead boots without extraneous ueventd warnings Change-Id: I56cad854b0defd936a7fbcab73fe2f2963c0e2e4
* | | | | | Merge "bootstat: Remove the CAP_SYSLOG capability"Treehugger Robot2018-06-122-21/+2
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | bootstat: Remove the CAP_SYSLOG capabilityLuis Hector Chavez2018-06-112-21/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change removes the CAP_SYSLOG file based capability from bootstat, since the intention is that it should not be accessing the logs in the long term. In order to avoid bitrot, the fallback code that depends on CAP_SYSLOG has also been removed. Bug: 62845925 Test: system/core/bootstat/boot_reason_test.sh Change-Id: I899be44ef3ac1c4d81072f801d55c928ae09bb15
* | | | | | Merge "logd: Move the capabilities from file based to ambient"Treehugger Robot2018-06-122-4/+2
|\| | | | |
| * | | | | logd: Move the capabilities from file based to ambientLuis Hector Chavez2018-06-112-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change moves logd's capabilities from being file based to being set by init through ambient capabilities. Bug: 62845925 Test: sailfish:/ # grep Cap /proc/`pidof logd`/status CapInh: 0000000000000000 CapPrm: 0000000440000000 CapEff: 0000000440000000 CapBnd: 0000000440000040 CapAmb: 0000000000000000 $ capsh --decode=0x440000040 0x440000040=cap_setgid,cap_audit_control,cap_syslog Test: liblog-unit-tests, logd-unit-tests, logcat-unit-tests Change-Id: I28c7c4ad37ad5eafd399aef78c303ce31298a9ef
* | | | | | Merge "init: Actually check the return value for calls during first stage init"Tom Cherry2018-06-121-19/+33
|\ \ \ \ \ \
| * | | | | | init: Actually check the return value for calls during first stage initTom Cherry2018-06-121-19/+33
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Init never checked the return values of the calls made during first stage init (since of course they're not going to fail, right?). But of course commands can fail and they might not necessarily be obvious when they do, so let's make it obvious. Since the kernel log isn't up until later, this creates a list of the failures that can then be sent to the kernel log once it's ready (pending of course failures in setting it up...) Test: boot bullhead, don't see errors Change-Id: I8c12c61fa12e4368346e8b0e1c0bb0844b5d0377
* | | | | | Merge "bootstat: ppdone_timeout kernel panic"Treehugger Robot2018-06-121-0/+1
|\ \ \ \ \ \
| * | | | | | bootstat: ppdone_timeout kernel panicMark Salyzyn2018-06-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add kernel_panic,_sde_encoder_phys_cmd_handle_ppdone_timeout to help track occurrences. Test: compile Bug: 67728931 Change-Id: I3306ae2936dc4355902e838d9ac8d8b11837348d
* | | | | | | Merge "fs_mgr: reorder getting boot config"Treehugger Robot2018-06-111-15/+15
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | fs_mgr: reorder getting boot configBowgo Tsai2018-06-121-15/+15
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The params in kernel cmdline is expected to be consumed by kernel. For bootloader <--> userland communication, we're moving it to device-tree or system property. Bug: 78615592 Test: boot a device Change-Id: I26bc2ea4cda91241242eb9fd0210b5b10659a297
* | | | | | Merge "fs_mg: allow getting VBMeta Digest from device-tree"Treehugger Robot2018-06-111-3/+3
|\ \ \ \ \ \
| * | | | | | fs_mg: allow getting VBMeta Digest from device-treeBowgo Tsai2018-06-111-3/+3
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fs_mgr gets androidboot.vbmeta.{size, hash_alg, digest} from kernel cmdline to assure the integrity of all vbmeta structs. This CL Allows fs_mgr to get those parameters from device tree because they're only consumed by userland instead of kernel. https://android.googlesource.com/platform/external/avb/+/master#The-VBMeta-Digest Bootloader could construct a device tree overlay at run time then merge it into main device tree. e.g., firmware { android { vbmeta.size = "5245"; vbmeta.hash_alg = "sha256"; vbmeta.digest = "0c51233ca3ecaa...63c6d912e79b709"; }; }; Bug: 80168311 Test: boot a device using AVB Change-Id: I6cf151713af04e6cf554d593e9f0b43e9e214d8c
* | | | | | Merge "Add files to CleanSpec.mk"Treehugger Robot2018-06-111-0/+3
|\ \ \ \ \ \
| * | | | | | Add files to CleanSpec.mkLogan Chien2018-06-101-0/+3
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit removes stale files from incremental builds: * /system/etc/ld.config.txt, * /system/etc/llndk.libraries.txt * /system/etc/public.libraries.txt These files are replaced by versioned ones. Bug: 78605339 Test: Those files are removed in incremental builds Merged-In: I7925fa45b47397829bde835ab3c479611faffa33 Change-Id: I7925fa45b47397829bde835ab3c479611faffa33 (cherry picked from commit 9afd9b488fa95358aff2f71f72a818ffa547e917)
* | | | | | Merge "fs_mgr: fs_mgr_get_boot_config_from_kernel_cmdline deal with quote"Treehugger Robot2018-06-114-14/+226
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | fs_mgr: fs_mgr_get_boot_config_from_kernel_cmdline deal with quoteMark Salyzyn2018-06-084-14/+226
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Spans quoted with " are dealt with atomically, and are stripped from the key/value results when parsing the kernel cmdline. Test: compile, device boot, fs_mgr_unit_test Bug: 109821005 Change-Id: I45f3d7395f34295edefdeaafa4c15c6ee25cc4da
* | | | | Merge "Update shell and utilities doc on the use of dd and grep."Tao Bao2018-06-081-5/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Update shell and utilities doc on the use of dd and grep.Tao Bao2018-06-081-5/+3
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have moved away from BSD dd and grep, which is also shown in the section for Android Q. Test: N/A Change-Id: I13484879e697a1cf2c8b82d7e28a167cb34c00fa
* | | | Merge "fs_mgr: remove some unused functions"Tom Cherry2018-06-084-30/+1
|\ \ \ \
| * | | | fs_mgr: remove some unused functionsTom Cherry2018-06-074-30/+1
| |/ / / | | | | | | | | | | | | | | | | Test: build Change-Id: I8a44f2f777fff369df06c73f06d53e448826f7b5
* | | | Merge "fs_mgr: avb should use built-in kernel command line parser"Treehugger Robot2018-06-071-22/+9
|\ \ \ \ | |_|/ / |/| | |
| * | | fs_mgr: avb should use built-in kernel command line parserMark Salyzyn2018-06-071-22/+9
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | Switch from open-coded parsing of /proc/cmdline to built-in fs_mgr_get_boot_config_from_kernel_cmdline function. Test: compile and smoke boot test Bug: 109821005 Change-Id: I935d2e76c76ad417cbcee398e2afbf9b061d1719
* | | Merge "libsysutils: Delete dead code: FrameworkClient"Treehugger Robot2018-06-072-79/+0
|\ \ \
| * | | libsysutils: Delete dead code: FrameworkClientBernie Innocenti2018-06-072-79/+0
| | | | | | | | | | | | | | | | | | | | Test: mm Change-Id: I372f2aa8d7f7e3f5ce1cd9399292bef9e4900de7
* | | | Merge "clang-format: Double-indent continuation lines"Treehugger Robot2018-06-071-0/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | clang-format: Double-indent continuation linesBernie Innocenti2018-06-071-0/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The default value for ContinuationIndentWidth inherited from the Google style is 4. Since .clang-format-4 doubles the value of IndentWidth from 2 to 4, it should also double ContinuationIndentWidth to retain Google's double-indent style. Before: void forEachInterface( const std::string& dirname, const std::function<void(const std::string& path)) { fn(dirname, "default"); DIR* dir = opendir(dirname.c_str()); After this patch: void forEachInterface( const std::string& dirname, const std::function<void(const std::string& path)) { fn(dirname, "default"); DIR* dir = opendir(dirname.c_str()); Test: applied to libsysutils/src/*.cpp and compared output. Change-Id: I75c50fa9becd5291a17047933f443cc6db77838a
* | | Merge "Fix exit-time-destructor warning"Treehugger Robot2018-06-061-1/+1
|\ \ \
| * | | Fix exit-time-destructor warningPirama Arumuga Nainar2018-06-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | By initializing the global handle_list on the heap. Test: Run Clang-built adb_test.exe under wine Change-Id: I2326011b7e44c6d0cb4721d4b68fde7188b87c38
* | | | Merge "libbase: fix libbase_test.logging.StdioLogger."Treehugger Robot2018-06-061-26/+25
|\ \ \ \
| * | | | libbase: fix libbase_test.logging.StdioLogger.Elliott Hughes2018-06-061-26/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I don't think the StdioLogger test ever passed. Move GetFileBasename to where we can use it from StdioLogger, and undo the mix of anonymous namespace vs static to consistently use static (which is the majority) while we're touching those lines. Bug: N/A Test: ran tests Change-Id: I95b3966cdb8af642bed71752bd7d4e3a86ac84ca
* | | | | Merge "Try to fix LocalUnwinderTest.unwind_after_dlopen in APCT."Elliott Hughes2018-06-061-0/+3
|\ \ \ \ \
| * | | | | Try to fix LocalUnwinderTest.unwind_after_dlopen in APCT.Elliott Hughes2018-06-061-0/+3
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Failure: system/core/libunwindstack/tests/LocalUnwinderTest.cpp:181: Failure Value of: handle != nullptr Actual: false Expected: true Bug: N/A Test: N/A Change-Id: I89b3228d51961f7bf952dd01f12f4ee61a97fe91
* | | | | Merge "Move per-file OWNERS directives to their directories."Lorenzo Colitti2018-06-063-4/+4
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Move per-file OWNERS directives to their directories.Lorenzo Colitti2018-06-063-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As documented at go/gerrit-owners, per-file directives cannot contain directory paths. Therefore the current per-file directives in system/core/OWNERS have no effect. Test: build/make/tools/checkowners.py system/core/{,libsysutils/src/,include/sysutils/}OWNERS Change-Id: Ia88b2be42dd50346578bb51dd17fb6136a4591f1
* | | | | Merge "Revert "SocketListener: use poll() instead of select()""Treehugger Robot2018-06-063-68/+107
|\ \ \ \ \ | |/ / / / |/| | | |