summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* toolbox: add prlimit commandIliyan Malchev2014-10-282-0/+77
|\ | | | | | | | | | | | | automerge: 5b244cd * commit '5b244cd4141d7e42bf9382e39c669e1ccf96266c': toolbox: add prlimit command
| * 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 6e93b246: am 80f227c1: am 66f0d93c: Don\'t allow SUPPORTED_ABIs to be set ↵Narayan Kamath2014-10-221-43/+0
|\ \ | |/ | | | | | | | | | | by the native bridge. * commit '6e93b246d41275ff55dfab2d747cf0d5c60b3652': Don't allow SUPPORTED_ABIs to be set by the native bridge.
| * 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
* | | | am 37d70f53: am c0b4b8b0: Merge "Ensure /data/adb exists"Nick Kralevich2014-10-211-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * commit '37d70f53672c8878a5ce5506d6d89b851400f8e6': Ensure /data/adb exists
| * \ \ \ am c0b4b8b0: Merge "Ensure /data/adb exists"Nick Kralevich2014-10-211-0/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c0b4b8b0f17efd4381a828bfbed232fb10b27300': Ensure /data/adb exists
| | * \ \ \ Merge "Ensure /data/adb exists"Nick Kralevich2014-10-211-0/+2
| | |\ \ \ \
| | | * | | | Ensure /data/adb existsNick Kralevich2014-10-211-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 Change-Id: I9cee2a0202417ff72a5ede7742e25877f51732dd
* | | | | | am b50d0cd5: Merge "rootdir: Make trusty version readable by dumpstate" into ↵Arve Hjønnevåg2014-10-201-0/+1
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit 'b50d0cd53f94b0c654e007464ec32396b0cb1aef': rootdir: Make trusty version readable by dumpstate
| * | | | | 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 a0a7ac03: am fe963bfd: am a1ac84cd: MingW doesn\'t handle ↵Adam Lesinski2014-10-201-2/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | __attribute__((weak)) for Windows PE * commit 'a0a7ac037dd998168fa56d76e9c27bfda1c6a41e': MingW doesn't handle __attribute__((weak)) for Windows PE
| * | | | | | 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
* | | | | | | am 7e38ab47: am 951c48c5: Merge "adb: Add USB vendor ID for TrekStor GmbH"JP Abgrall2014-10-201-0/+3
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | * commit '7e38ab476f808f84f0755ccbceb4cd7d8a1982a3': adb: Add USB vendor ID for TrekStor GmbH
| * | | | | | am 951c48c5: Merge "adb: Add USB vendor ID for TrekStor GmbH"JP Abgrall2014-10-201-0/+3
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | * commit '951c48c504b28cd1646560a73d670493722f68f0': adb: Add USB vendor ID for TrekStor GmbH
| | * | | | | Merge "adb: Add USB vendor ID for TrekStor GmbH"JP Abgrall2014-10-201-0/+3
| | |\ \ \ \ \
| | | * | | | | adb: Add USB vendor ID for TrekStor GmbHThorsten Koroscha2014-10-201-0/+3
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1d7fc14e691b4ab504c5205b21c93939499cdff9 Signed-off-by: Thorsten Koroscha <t.koroscha@trekstor.de>
* | | | | | | am 37ef356a: Merge "Remove libsigchain from LD_PRELOADs" into lmp-mr1-devDmitriy Ivanov2014-10-200-0/+0
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | * commit '37ef356a8e4577b289ade868900e15c82c0ad57f': Remove libsigchain from LD_PRELOADs
| * | | | | | 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 81080625: am 88b463a1: am 1c77bf4c: Merge "Fix windows specific behavior ↵Xavier Ducrohet2014-10-161-1/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of FileMap" into lmp-dev * commit '81080625a239ae953ef355974e1da7d50389fbb6': Fix windows specific behavior of FileMap
| * | | | | | 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 66fa33a7: am dc7957d9: am cd1da4e0: Fix toolchain issue for windows build ↵Xavier Ducrohet2014-10-161-0/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of libziparchive. * commit '66fa33a7adf38e513825d36e98b7cdf2c225d2b4': Fix toolchain issue for windows build of libziparchive.
| * | | | | | | 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 2d241ec8: am 3a387176: Merge "Don\'t build init with clang for now"Chih-hung Hsieh2014-10-161-0/+4
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | * commit '2d241ec8a86c56bbf8522eb007674d7b4e3d164d': Don't build init with clang for now
| * | | | | am 3a387176: Merge "Don\'t build init with clang for now"Chih-hung Hsieh2014-10-161-0/+4
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | * commit '3a3871769130428bc1b8f3de03be7231750e1b82': Don't build init with clang for now
| | * | | | Merge "Don't build init with clang for now"Chih-hung Hsieh2014-10-161-0/+4
| | |\ \ \ \
| | | * | | | Don't build init with clang for nowBernhard Rosenkraenzer2014-10-041-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | init doesn't start when built with clang. Set LOCAL_CLANG:=false until this is analyzed and fixed. Change-Id: I5a7944aef676ce88defe5c0449e712d9812fb5f3 Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
* | | | | | | am 1a27d6ab: am 6d343432: am 67f46cb0: Fix issue #18000467: processgroup ↵Dianne Hackborn2014-10-151-1/+1
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | truncates buffer * commit '1a27d6ab328676bf648da74fe78836e7c1ffc8e2': Fix issue #18000467: processgroup truncates buffer
| * | | | | | 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 07f1300c: am 7979f1ce: Merge "Do not inline rarely used trace function ↵Chih-Hung Hsieh2014-10-152-39/+68
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bodies." * commit '07f1300c4c4f7d3c0df540bf8df3443c3f4539cd': Do not inline rarely used trace function bodies.
| * | | | | | am 7979f1ce: Merge "Do not inline rarely used trace function bodies."Chih-Hung Hsieh2014-10-152-39/+68
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | * commit '7979f1ce5fd771aa9814ef7390f290201ae0790d': Do not inline rarely used trace function bodies.
| | * | | | | Merge "Do not inline rarely used trace function bodies."Chih-Hung Hsieh2014-10-152-39/+68
| | |\ \ \ \ \
| | | * | | | | Do not inline rarely used trace function bodies.Chih-Hung Hsieh2014-10-142-39/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When atrace_* functions are inlined, the rarely used 1024-byte buffers are allocated on stack. BUG: 17444504 Change-Id: I773512aeb70e8b79f3803c6d59cba064d2aa65b6
* | | | | | | | am 4f083c61: am a8aad166: Merge "logd: insert order for first entry"Mark Salyzyn2014-10-151-1/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '4f083c6156cb59eddcb52094da7972f16dde2220': logd: insert order for first entry
| * | | | | | | am a8aad166: Merge "logd: insert order for first entry"Mark Salyzyn2014-10-151-1/+2
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a8aad1667ff191cbc3972c40e8f9ec960db4ef96': logd: insert order for first entry
| | * | | | | | Merge "logd: insert order for first entry"Mark Salyzyn2014-10-141-1/+2
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | logd: insert order for first entryMark Salyzyn2014-10-141-1/+2
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: I39e8e6d32407a1796a0c3a121f9dc4dc5402c3df
* | | | | | | am 00ffc22c: am e09bfb12: am 2c5e7e10: Maybe fix issue #17969789: Shamu FR: ↵Dianne Hackborn2014-10-142-5/+29
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Runtime restart while scrolling Instagram * commit '00ffc22cbf1809b730ea0c8e849437db1abf8196': Maybe fix issue #17969789: Shamu FR: Runtime restart while scrolling Instagram
generated by cgit v1.1 at 2024-07-17 15:09:14 +0000