summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* DO NOT MERGE: Switch fs_mgr to use SHA-256 instead of SHA-1Sami Tolvanen2014-11-131-3/+3
| | | | | | | | | | | | | | | | | Verity metadata signatures will be switched to SHA-256. Switch fs_mgr signature verification to use the correct algorithm. Needs matching changes from https://googleplex-android-review.git.corp.google.com/#/c/579905/ https://googleplex-android-review.git.corp.google.com/#/c/583213/ https://googleplex-android-review.git.corp.google.com/#/c/583214/ https://googleplex-android-review.git.corp.google.com/#/c/583233/ Bug: 15984840 Bug: 18120110 Bug: 17917515 Change-Id: I8f90519bffa105a0eb7abeaad3aea1ffceb851e2 (cherry picked from commit a3465e250cfc3c00931735711e11ad61cf84d8b2)
* fs_mgr: let fsck.f2fs actually attempt a fixJP Abgrall2014-11-081-1/+2
| | | | | | | | | | The newer fsck.f2fs (1.4.0++) has better fix support, so invoke it. Requires http://ag/583949 f2fs-tools update. Bug: 17640053 Bug: 18292088 Change-Id: I42370d92b232e0bdbf28cccf7035a15dbffeb268 Signed-off-by: JP Abgrall <jpa@google.com>
* Fix adb/fastboot windows compilations.Christopher Ferris2014-11-065-2/+11
| | | | | | | | | | Many of the windows files where not including stdlib.h even though they are using malloc/free calls. Bug: 18283958 (cherry picked from commit ae7bf0959bd3f79afbf365e41f015ed1c304afdc) Change-Id: Iebc09cc314fa8f0ba6c6cd45ba26135052f156dd
* Ensure /data/adb existsNick Kralevich2014-11-051-0/+2
|\ | | | | | | | | | | | | automerge: 6672300 * commit '667230074b6e4e306a50d84a88a57bf4f1ec0291': Ensure /data/adb exists
| * Ensure /data/adb existsNick Kralevich2014-11-051-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Ensure that /data/adb always exists. This directory is used for writing adb debugging information when persist.adb.trace_mask is set. Bug: https://code.google.com/p/android/issues/detail?id=72895 (cherry picked from commit 89252ce31aacb27248e708b6487f730d3a024943) Change-Id: I44e01bee50125f4e6e5fff6e74c53bb2022ce355
* | Merge "Fix native_handle_create to check if malloc fails" into lmp-mr1-devMichael Lentine2014-11-031-3/+5
|\ \
| * | Fix native_handle_create to check if malloc failsMichael Lentine2014-11-031-3/+5
| | | | | | | | | | | | | | | Bug: 18076253 Change-Id: I8dbe3af88f52f18f74a3ab857fea53ae7585e2f7
* | | am 4b970895: am 5bd96311: DO NOT MERGE Restore libcorkscrew unwinding. ↵Christopher Ferris2014-11-030-0/+0
|\ \ \ | | |/ | |/| | | | | | | | | | automerge: 5a69c1d -s ours automerge: d7c8db1 -s ours * commit '4b970895848ff114ac1011a293663eb6d43e8fd7':
| * | am 5bd96311: DO NOT MERGE Restore libcorkscrew unwinding. automerge: 5a69c1d ↵Christopher Ferris2014-11-030-0/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | -s ours automerge: d7c8db1 -s ours * commit '5bd963117aa121d1fdfd5def4379cd363cf60ece':
| | * \ DO NOT MERGE Restore libcorkscrew unwinding. automerge: 5a69c1d -s oursChristopher Ferris2014-11-030-0/+0
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | automerge: d7c8db1 -s ours * commit 'd7c8db124c1b4b13d7f55f7c338913ec6d0cd3d1':
| | | * \ DO NOT MERGE Restore libcorkscrew unwinding.Christopher Ferris2014-10-240-0/+0
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 5a69c1d -s ours * commit '5a69c1db365323f984c6a8afd1fc035551e96d99': DO NOT MERGE Restore libcorkscrew unwinding.
* | | | \ \ am a18bcfa4: am 91ce3576: resolve merge conflicts of 290efd2 to ↵Christopher Ferris2014-11-030-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | klp-modular-dev-plus-aosp. automerge: e916313 * commit 'a18bcfa45e9d37650bca158577d02f5059453935':
| * | | | | am 91ce3576: resolve merge conflicts of 290efd2 to ↵Christopher Ferris2014-11-030-0/+0
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | klp-modular-dev-plus-aosp. automerge: e916313 * commit '91ce3576337b0541912da7ec4b1efd802568dfce':
| | * | | | resolve merge conflicts of 290efd2 to klp-modular-dev-plus-aosp.Christopher Ferris2014-11-030-0/+0
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | automerge: e916313 * commit 'e916313defbd09479dc29d38f3aa467f3b296f7c':
| | | * | | resolve merge conflicts of 290efd2 to klp-modular-dev-plus-aosp.Christopher Ferris2014-10-240-0/+0
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic6b18eeae43c2ef2256a0508ac60c1724385d3b0
* | | | \ \ \ Merge "Fix debuggerd issues." into lmp-mr1-devChristopher Ferris2014-11-035-63/+56
|\ \ \ \ \ \ \
| * | | | | | | Fix debuggerd issues.Christopher Ferris2014-11-025-63/+56
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fix a problem where a tid exits before the attach completes, and it causes debuggerd to self terminate. - Fix a problem where sibling tid dumps do not properly wait for the tid to get signalled. Bug: 17800180 Bug: 12567315 Change-Id: Ic3cd619cc2c72402f9a45f14abeed4721b50d64d
* | | | | | | Fix mac buildNick Kralevich2014-11-032-0/+2
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "errno.h" doesn't get included on mac so we need to do it explicitely. system/core/libnativebridge/tests/CodeCacheExists_test.cpp:30:15: error: use of undeclared identifier 'ENOENT' ASSERT_EQ(ENOENT, errno); (cherry picked from commit bcd1a834d4a979ae650ac8677b0647cfb3ec4766) Change-Id: Ib894e3a3912a943c61787461f127e4b11aacf212
* | | | | | Fix verity on system partitions larger than 2GSami Tolvanen2014-10-291-22/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the system partition is larger than 2G, the device fails to read verity metadata, because fseek accepts only a 32-bit signed offset. Switch from fseek to lseek64 to allow seeking using a 64-bit offset, which solves the problem. At the same time, move away from stdio in the function. Bug: 17705619 Change-Id: I226320498dcb750ec6cde84411c7fe0774c9cab7
* | | | | | Merge "Add code cache tests to libnativebridge." into lmp-mr1-devCalin Juravle2014-10-285-1/+112
|\ \ \ \ \ \
| * | | | | | Add code cache tests to libnativebridge.Calin Juravle2014-10-285-1/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18027433 (cherry picked from commit 59a719c466d33479265a3e9c204c8dc9a8f435f1) Change-Id: I32bcf3ae0d4569d4d8b88168e6c36ddff70b8f7d
* | | | | | | Merge "Handle code_cache dir creation in libnativebridge" into lmp-mr1-devCalin Juravle2014-10-2811-47/+313
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Handle code_cache dir creation in libnativebridgeCalin Juravle2014-10-2711-47/+313
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also: - add kPreInitiliazed state to native bridge with check transition: kOpened->kPreInitialized->kInitialized - made sure we free the memory for the code_cache_path - tidy up some error messages - tidy up tests - add a dummy native bridge to test with Bug: 18027433 Bug: 18097480 (cherry picked from commit f9d9e2a2d96559c3165405d572b08e260156074a) Change-Id: I9ce578949dbe522d5033465df7ca49fdd3aa3cbf
* | | | | | | Merge "adb warns on remount when verity is enabled" into lmp-mr1-devPaul Lawrence2014-10-271-1/+33
|\ \ \ \ \ \ \
| * | | | | | | adb warns on remount when verity is enabledPaul Lawrence2014-10-271-1/+33
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18119147 Change-Id: I75e5edf83fa01dbf2495e24df4597dce41f13654
* | | | | | | toolbox: add prlimit commandIliyan Malchev2014-10-272-0/+77
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | adb shell prlimit <pid> <cur> <max> prlimit uses prlimit internally to allow you to set the limits on an arbitrary process, if you have the privileges to. Change-Id: Ie9a5dc510c7c695debd8f948361d4c51befa5604 Signed-off-by: Iliyan Malchev <malchev@google.com>
* | | | | | am 80f227c1: am 66f0d93c: Don\'t allow SUPPORTED_ABIs to be set by the ↵Narayan Kamath2014-10-221-43/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | native bridge. * commit '80f227c1f75d753396a6efd6fccfc0c76c93bae4': Don't allow SUPPORTED_ABIs to be set by the native bridge.
| * | | | | am 66f0d93c: Don\'t allow SUPPORTED_ABIs to be set by the native bridge.Narayan Kamath2014-10-211-43/+0
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '66f0d93c265657e17c7a1ddd74beb61070a8df69': Don't allow SUPPORTED_ABIs to be set by the native bridge.
| | * | | | Don't allow SUPPORTED_ABIs to be set by the native bridge.Narayan Kamath2014-10-211-43/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SUPPORTED_ABIs is a prioritized list of all ABIs a device support, and must not vary depending on whether or not an app is emulated. bug: 18061712 Change-Id: I3ec3897d23e37c645b4d9d9e6e32aae9afff952c
* | | | | | Merge "rootdir: Make trusty version readable by dumpstate" into lmp-mr1-devArve Hjønnevåg2014-10-201-0/+1
|\ \ \ \ \ \
| * | | | | | rootdir: Make trusty version readable by dumpstateArve Hjønnevåg2014-10-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I761650d286b454f1fe01a585e7cd6ec769bfc527
* | | | | | | am fe963bfd: am a1ac84cd: MingW doesn\'t handle __attribute__((weak)) for ↵Adam Lesinski2014-10-201-2/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows PE * commit 'fe963bfd8cf3a240785892f8194debb4e0ebb92d': MingW doesn't handle __attribute__((weak)) for Windows PE
| * | | | | | am a1ac84cd: MingW doesn\'t handle __attribute__((weak)) for Windows PEAdam Lesinski2014-10-201-2/+1
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | * commit 'a1ac84cd8d7357f38a9fc60ab9d42e81d1790fd2': MingW doesn't handle __attribute__((weak)) for Windows PE
| | * | | | | MingW doesn't handle __attribute__((weak)) for Windows PEAdam Lesinski2014-10-201-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows PE format doesn't have the same support for weak symbols as ELF does. The symbol android_log_id_to_name was strangely omitted from the resulting Windows executable and the callsite where it was supposed to be called was relaced with a different symbol, which caused a crash in AAPT on Windows. This change works due to a careful set of #ifdefs that ensure only one definition of android_log_id_to_name is defined, but there are other uses of __attribute__((weak)) which should be inspected. Change-Id: I3b58076e31d9b28c5143773a170e9ffda9fa3815
* | | | | | | Merge "Remove libsigchain from LD_PRELOADs" into lmp-mr1-devDmitriy Ivanov2014-10-201-1/+0
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Remove libsigchain from LD_PRELOADsDmitriy Ivanov2014-10-161-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 15345057 Bug: 15426766 (cherry picked from commit c9f9f35efa43b3ac75b1a7e76fe1071a2e9d52ea) Change-Id: If54e1aeaa1e2abe061ac19666af4f4e058b81df2
* | | | | | | am 88b463a1: am 1c77bf4c: Merge "Fix windows specific behavior of FileMap" ↵Xavier Ducrohet2014-10-161-1/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev * commit '88b463a1c12cccc6738baa51642bf639bd9a6e53': Fix windows specific behavior of FileMap
| * | | | | | am 1c77bf4c: Merge "Fix windows specific behavior of FileMap" into lmp-devXavier Ducrohet2014-10-161-1/+0
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | * commit '1c77bf4ce5059f3a770418cfa8afed39ee41ab24': Fix windows specific behavior of FileMap
| | * | | | | Merge "Fix windows specific behavior of FileMap" into lmp-devXavier Ducrohet2014-10-161-1/+0
| | |\ \ \ \ \
| | | * | | | | Fix windows specific behavior of FileMapXavier Ducrohet2014-10-161-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The implementation of the FileMap destructor would close the file, only on Windows, which did not match the behavior on mac/linux. This is because calling munmap does not close the file descriptor. It must be closed separately, before or after munmap. On Windows, the file must also be closed manually, before or after closing the mappingFile. The change basically removes the closing file from the windows-specific part of the destructor, to make behavior more consistent on all platforms where the caller to FileMap is responsible for closing its own file (since FileMap receives an opened file). Change-Id: I5e3cfffbb870d5f3595802ccac57dbc1dbf1ce6e
* | | | | | | | am dc7957d9: am cd1da4e0: Fix toolchain issue for windows build of ↵Xavier Ducrohet2014-10-161-0/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | / / / / | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | libziparchive. * commit 'dc7957d9b782a759a4eaa75832dd18c9943c7d0c': Fix toolchain issue for windows build of libziparchive.
| * | | | | | am cd1da4e0: Fix toolchain issue for windows build of libziparchive.Xavier Ducrohet2014-10-161-0/+3
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'cd1da4e04f0eb71a92a586c66acd0e34115608e1': Fix toolchain issue for windows build of libziparchive.
| | * | | | | Fix toolchain issue for windows build of libziparchive.Xavier Ducrohet2014-10-161-0/+3
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With mingw 4.8, the new default packed behavior is broken and makes zip archive fails due to unexpected misalignment in CentralDirectoryRecord. This patch uses -mno-ms-bitfields to revert to the old packed behavior. Change-Id: Ic977c841e330e19451db1d31ddb22e570a525062
* | | | | | am 6d343432: am 67f46cb0: Fix issue #18000467: processgroup truncates bufferDianne Hackborn2014-10-151-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '6d34343263d890114410fafc85885501eca8d3d6': Fix issue #18000467: processgroup truncates buffer
| * | | | | am 67f46cb0: Fix issue #18000467: processgroup truncates bufferDianne Hackborn2014-10-151-1/+1
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '67f46cb0e137edbf4a6f7014ca8a3a58484016d1': Fix issue #18000467: processgroup truncates buffer
| | * | | | Fix issue #18000467: processgroup truncates bufferDianne Hackborn2014-10-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3d98a4da9c47d83d25a11ff0ef94cfcab1feabea
* | | | | | am e09bfb12: am 2c5e7e10: Maybe fix issue #17969789: Shamu FR: Runtime ↵Dianne Hackborn2014-10-142-5/+29
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | restart while scrolling Instagram * commit 'e09bfb1213b9174d4c3d6536b755d924772ce881': Maybe fix issue #17969789: Shamu FR: Runtime restart while scrolling Instagram
| * | | | | am 2c5e7e10: Maybe fix issue #17969789: Shamu FR: Runtime restart while ↵Dianne Hackborn2014-10-142-5/+29
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scrolling Instagram * commit '2c5e7e102bc2059d22f8457db68c567b64cec963': Maybe fix issue #17969789: Shamu FR: Runtime restart while scrolling Instagram
| | * | | | Maybe fix issue #17969789: Shamu FR: Runtime restart while scrolling InstagramDianne Hackborn2014-10-132-5/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It looks like there were a couple problems in the code: - It would not 0-terminate the string it read, to make sure we didn't see garbage at the end. - It didn't reduce buf_len as it processes data in the buffer, so if we need to read more we will increase the buffer length to be longer than the actual available data. Also put in some logs about every thing we kill, so we can see what is going on when debugging. And add a special check for us trying to kill pid 0 for any reason, since doing so seem to be terminal to the caller. Change-Id: I2fe29bfef08938b8a2eb182475c0705c14d8d84f
* | | | | | am b63aab58: am 8218b6aa: newfs_msdos: Set sectors per fat onceDaniel Rosenberg2014-10-111-1/+3
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'b63aab58065f5fb2a04c5d7c49f1d61bf7e17179': newfs_msdos: Set sectors per fat once
generated by cgit v1.1 at 2024-12-25 06:12:35 +0000