summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Return path including executable instead of without"Elliott Hughes2014-11-202-10/+10
|\
| * Return path including executable instead of withoutAl Sutton2014-11-202-10/+10
| | | | | | | | | | | | | | | | | | | | | | The previous implementation returned the path the executable was in instead of returning the path including the executable (i.e. it returned ...bin instead of ...bin/executable). This is not what the original methods did and caused the process forking of adb to fail. This patch corrects the implementation. Change-Id: Ib58497cab35706041f170c1bc97c31fd5d965f90
* | Merge "Disable vendor id filtering for Linux."Elliott Hughes2014-11-202-20/+4
|\ \ | |/ |/|
| * Disable vendor id filtering for Linux.Elliott Hughes2014-11-192-20/+4
|/ | | | | | | | | | It's time we switched to blacklisting any problematic devices rather than slowly whitelisting the entire world. This seems to work for me, but let's see how other people get on before coming back to actually remove the list. We'll also need to find a Mac to test the equivalent Mac change. Change-Id: I2bf583a27f9a3f98ef006ea62b906a4f89960507
* Merge "kill HAVE_PREAD"Yabin Cui2014-11-201-2/+2
|\
| * kill HAVE_PREADYabin Cui2014-11-191-2/+2
|/ | | | | Bug: 18397613 Change-Id: I3990bd0f95cf38c5a9229180a1ddc699941892fc
* Merge "logd: throttle SELinux denials to 20/sec"Nick Kralevich2014-11-193-22/+13
|\
| * logd: throttle SELinux denials to 20/secNick Kralevich2014-11-193-22/+13
| | | | | | | | | | | | | | | | | | | | | | Impose a limit of 20 selinux denials per second. Denials beyond that point don't add any value, and have the potential to cause crashes or denial of service attacks. Do some other misc cleanup while I'm here. Bug: 18341932 Change-Id: I6125d629ae4d6ae131d2e53bfa41e1f50277d402
* | Merge "Fix building on modern versions of Xcode and OS X."Elliott Hughes2014-11-192-15/+16
|\ \ | |/ |/|
| * Fix building on modern versions of Xcode and OS X.Al Sutton2014-11-192-15/+16
|/ | | | | | | | | | | Recent versions of XCode fail to compile the adb and fastboot binaries due to two functions being deprecated in 10.9 (GetCurrentProcess and ProcessInformationCopyDictionary), and the use of -Werrror. This patch replaces the method implementations which use calls to methods deprecated in the 10.9 SDK with versions which only call non-deprecated methods. Change-Id: I855bf26aff45093ca9022924f3ecd1b80f2305a8
* Merge "kill HAVE_MADVISE"Yabin Cui2014-11-191-2/+6
|\
| * kill HAVE_MADVISEYabin Cui2014-11-191-2/+6
|/ | | | | | Change to avoid "unused parameter" warning. Bug: 18397020 Change-Id: I4b26de55314c78237daead8e873385b97cafe4d4
* Merge "kill HAVE_MADVISE"Yabin Cui2014-11-191-2/+2
|\
| * kill HAVE_MADVISEYabin Cui2014-11-181-2/+2
|/ | | | | Bug: 18397020 Change-Id: Ibc8d886d729c51932a403531888214de4e541452
* Merge "Revert "adb: Add USB vendor ID for Honeywell""Elliott Hughes2014-11-181-3/+0
|\
| * Revert "adb: Add USB vendor ID for Honeywell"Elliott Hughes2014-11-181-3/+0
| | | | | | | | | | | | This reverts commit 8c4c8e8988411449ecb2f50c25d3e4188e81e7c0. Change-Id: Ia1cad862f42e5bea3174ed2cc0eea5232fc0a858
* | Merge "toolbox: enable mkswap to work on block devices"Elliott Hughes2014-11-181-41/+39
|\ \
| * | toolbox: enable mkswap to work on block devicesAndrew Boie2014-11-181-41/+39
|/ / | | | | | | | | Change-Id: I9b71ca3fa09ffbe12dcc4d04229edab80851db4d Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
* | Merge "toolbox: indicate why swap{on|off} failed"Elliott Hughes2014-11-182-2/+2
|\ \
| * | toolbox: indicate why swap{on|off} failedAndrew Boie2014-04-302-2/+2
| | | | | | | | | | | | | | | Change-Id: I1247e3592ab0f9878fb27d114fd14f9b29282b0e Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
* | | Merge "kill HAVE_TERMIO_H"Yabin Cui2014-11-181-12/+17
|\ \ \
| * | | kill HAVE_TERMIO_HYabin Cui2014-11-171-12/+17
| | | | | | | | | | | | | | | | | | | | Bug: 18398307 Change-Id: Idbb89a074cdf16869cae3f667e89472781f37a5f
* | | | Merge "Remove atomic-inline.h."Elliott Hughes2014-11-173-21/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Remove atomic-inline.h.Elliott Hughes2014-11-173-21/+2
|/ / / | | | | | | | | | Change-Id: I3ac0229b9c516744e6a9c9d9e795b43bc9c5636b
* | | Merge "Remove the error-prone TARGET_CPU_SMP from system/core."Elliott Hughes2014-11-173-18/+2
|\ \ \
| * | | Remove the error-prone TARGET_CPU_SMP from system/core.Elliott Hughes2014-11-173-18/+2
|/ / / | | | | | | | | | | | | | | | | | | | | | This means that code that uses libcutils no longer has to ensure that it's set ANDROID_SMP in the calling code's Android.mk for this to function correctly. Change-Id: I80c7ff170cd621106f34d6b74689d6b4f03e4eb7
* | | Merge "Update calls to IInterface::asBinder()"Marco Nelissen2014-11-171-5/+5
|\ \ \
| * | | Update calls to IInterface::asBinder()Marco Nelissen2014-11-171-5/+5
|/ / / | | | | | | | | | | | | | | | to use the new static version. Change-Id: Ia7b10eb38ca55b72278bfd33d3bf647f338b4e6a
* | | Merge "Move debuggerd to libc++."Dan Albert2014-11-161-2/+0
|\ \ \
| * | | Move debuggerd to libc++.Dan Albert2014-11-151-2/+0
| | | | | | | | | | | | | | | | | | | | Bug: 15193147 Change-Id: I935a08e98077b688d1735fb5b84a615cb7df8810
* | | | Merge "Move libutils to libc++."Dan Albert2014-11-161-4/+0
|\ \ \ \ | |/ / / |/| | |
| * | | Move libutils to libc++.Dan Albert2014-11-151-4/+0
|/ / / | | | | | | | | | | | | Bug: 15193147 Change-Id: I85aff3bcabb5ee3c8be9918b7bef0fd1bbfa98e3
* | | Merge "Don't manually link libgtest_main in libion tests."Dan Albert2014-11-141-1/+0
|\ \ \
| * | | Don't manually link libgtest_main in libion tests.Dan Albert2014-11-141-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is actually probably broken right now, since these tests are getting both the libc++ flavor and stlport flavor of libgtest_main. Bug: 15193147 Change-Id: Ic2f8dda98240c12591803f3c3522505314a05609
* | | | Merge "Disable the static libcutils tests."Dan Albert2014-11-141-15/+17
|\ \ \ \
| * | | | Disable the static libcutils tests.Dan Albert2014-11-141-15/+17
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | The static libcutils tests cannot be built when using libc++ because there are multiple symbol definition errors between libc++ and libgcc. Bug: 18389856 Change-Id: I6f41c561f97b3a37477f844e9abf6551524a0fa3
* | | | Merge "Convert futex to cond wait."Christopher Ferris2014-11-144-24/+56
|\ \ \ \ | |/ / / |/| | |
| * | | Convert futex to cond wait.Christopher Ferris2014-11-144-24/+56
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Switch to the better supported pthread_cond to handle the Wait/Wake functions. Also, increase the number of simultaneous threads in the thread tests. Bug: 18381207 (cherry picked from commit db44538387b08f367fc2419653639866f4c2fbd6) Change-Id: Id326a7a7b92cb61573def3f761597c40f3ef2f4b
* | | Merge "System/core: Use memmove"Andreas Gampe2014-11-141-1/+1
|\ \ \
| * | | System/core: Use memmoveAndreas Gampe2014-11-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Should use memmove when you expect overlap. Change-Id: I268a173db40a4be54232958e37aa8a03c2a885ee
* | | | Merge "Second attempt to "Rewrite atomic.h to use stdatomic.h.""Hans Boehm2014-11-149-1040/+120
|\ \ \ \
| * | | | Second attempt to "Rewrite atomic.h to use stdatomic.h."Hans Boehm2014-11-139-1040/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should not be committed until win_sdk and aarch64 builds are fixed in the presence of this CL. This reverts commit 2789faabfa9cdf16902a52a1de3fc4a7ae98efed. We additionally remove uniprocessor support from the earlier CL, thus avoiding a potential compiler code reordering issue. Change-Id: I7207a5ca2efa907a6f757f172d7090a62b2311fe
* | | | | Merge "Fix a trivial typo."Chih-Hung Hsieh2014-11-131-1/+1
|\ \ \ \ \
| * | | | | Fix a trivial typo.Chih-Hung Hsieh2014-11-131-1/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clang compiler gave a correct warning on this mismatch of names in #ifndef and #define. Change-Id: I360f0c40ee98162093dde8f9815a02a54e5b2cb7
* | | | | Merge "kill HAVE_FORKEXEC"Yabin Cui2014-11-133-20/+18
|\ \ \ \ \
| * | | | | kill HAVE_FORKEXECYabin Cui2014-11-123-20/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18317407 Change-Id: I4eecb3c9d745e3dabfc46fa595aac7f94f6d93e3
* | | | | | Merge "Add LOCAL_MULTILIB := both to Darwin libbacktrace."Dan Albert2014-11-131-0/+2
|\ \ \ \ \ \
| * | | | | | Add LOCAL_MULTILIB := both to Darwin libbacktrace.Dan Albert2014-11-131-0/+2
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was previously set for libbacktrace_libc++, but apparently never was for libbacktrace. Change-Id: I85dc44b356710c6367f5cea3bc0a4d6c817ca202
* | | | | | Merge "Sdcard: Initialize the padding output value"Elliott Hughes2014-11-131-0/+1
|\ \ \ \ \ \
| * | | | | | Sdcard: Initialize the padding output valueDaisuke Okitsu2014-11-131-0/+1
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add initialization of the output value in handle_write. This value is referred to in FUSE so initialization is necessary. See also handle_open and handle_opendir. Change-Id: I6507f113da9f6823fbfa459624d6594fc20afa51
generated by cgit v1.1 at 2025-01-10 09:24:57 +0000