summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
...
* | | am ec556521: Merge "Remove HAVE_LIBC_SYSTEM_PROPERTIES and ↵Elliott Hughes2015-01-121-16/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | HAVE_SYSTEM_PROPERTY_SERVER." * commit 'ec556521e23f66ea52e41a7d9540b2dec31766c5': Remove HAVE_LIBC_SYSTEM_PROPERTIES and HAVE_SYSTEM_PROPERTY_SERVER.
| * | Remove HAVE_LIBC_SYSTEM_PROPERTIES and HAVE_SYSTEM_PROPERTY_SERVER.Elliott Hughes2015-01-121-16/+0
| | | | | | | | | | | | Change-Id: I3d92dbecebd2bb449a8c4332de684919a58847ad
* | | am 9da414f9: Merge "Linux always has POSIX clocks available."Elliott Hughes2015-01-101-3/+3
|\ \ \ | |/ / | | | | | | | | | * commit '9da414f95e06979e60b48380afbf5372c1ef0ef3': Linux always has POSIX clocks available.
| * | Linux always has POSIX clocks available.Elliott Hughes2015-01-091-3/+3
| | | | | | | | | | | | | | | | | | | | | pixelflinger doesn't have to run on the Mac, but the Condition code might. Change-Id: Ib4e9b4daa6e848ffd5742959427b172d45f08e3c
* | | am 4c6c6d1c: Merge "You either have winsock or <sys/sockets.h>."Elliott Hughes2015-01-091-1/+1
|\ \ \ | |/ / | | | | | | | | | * commit '4c6c6d1c7ed7d8481d717f949c18657efa5533af': You either have winsock or <sys/sockets.h>.
| * | You either have winsock or <sys/sockets.h>.Elliott Hughes2015-01-091-1/+1
| | | | | | | | | | | | | | | | | | There is no third choice. Change-Id: I8f1206f22798f747896dd53f3081cdfa4b1707c4
* | | am 7208a015: Merge "Mutex: add timedLock() method"Jesse Hall2015-01-071-4/+24
|\ \ \ | |/ / | | | | | | | | | * commit '7208a01514284becbd32cf4dfd256e4b10448f8e': Mutex: add timedLock() method
| * | Merge "Mutex: add timedLock() method"Jesse Hall2015-01-071-4/+24
| |\ \
| | * | Mutex: add timedLock() methodJesse Hall2015-01-071-4/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is not available for host builds because OSX doesn't have pthread_mutex_timedlock() or equivalent. Bug: 18842510 Change-Id: I072e74ab1a6f770fd245828b39c5f954dda1113b
* | | | am e892279b: Merge "liblog: Add log_time += operator"Mark Salyzyn2015-01-051-0/+12
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'e892279b3a29060d873bd65e55b3a613e61fe04d': liblog: Add log_time += operator
| * | | liblog: Add log_time += operatorMark Salyzyn2015-01-051-0/+12
| |/ / | | | | | | | | | Change-Id: I1d2987b6cb333fc344d4fee1b7bb25f32a4143c6
* | | am da4f30c5: Merge "Remove incompatible Unicode compatibility types."Dan Albert2014-12-121-6/+0
|\ \ \ | |/ / | | | | | | | | | * commit 'da4f30c5b451091068ecb5f6fa3697a7dd6bb7df': Remove incompatible Unicode compatibility types.
| * | Merge "Remove incompatible Unicode compatibility types."Dan Albert2014-12-121-6/+0
| |\ \
| | * | Remove incompatible Unicode compatibility types.Dan Albert2014-11-201-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As well intentioned as these were, uint16_t and C++11's char16_t are _not_ actually compatible. They are not implicitly convertible, and they mangle differently, so they are not even ABI compatible. In our now wonderous world of C++11, no one should be using these, so just kill them. Bug: 18300613 Change-Id: I06d92d7f1d937dd94a620874323d4c50eb6a31bd
* | | | am 3570072c: Merge "Use full qualified name in macros."Chih-Hung Hsieh2014-12-111-3/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '3570072c362fc379ac83bcae6d9ff43db06ffcfb': Use full qualified name in macros.
| * | | Use full qualified name in macros.Chih-Hung Hsieh2014-12-111-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ANDROID_SINGLETON_STATIC_INSTANCE is used in some files out of the android namespace. If it does not use full qualified names, users of this macro will need to use it inside the 'android' namespace to avoid warnings from clang compiler. Change-Id: Ie4d4ba2b57fdc72d0deb3b7c2326304a44a1300f
* | | | am 4fca5918: audio: add usage "virtual source" to audio attributes.Eric Laurent2014-12-101-0/+1
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | * commit '4fca59181c838b91572d1b57cb74b26d0a70528f': audio: add usage "virtual source" to audio attributes.
| * | | audio: add usage "virtual source" to audio attributes.Eric Laurent2014-12-091-0/+1
| | | | | | | | | | | | | | | | | | | | Bug: 16006090. Change-Id: I2d22b52e97095b57a6508b82bd11e27f860bb2e7
* | | | am 47f52f24: audio: new stream typesEric Laurent2014-11-261-4/+8
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '47f52f247d6d895878b831de448f19b98225515d': audio: new stream types
| * | | audio: new stream typesEric Laurent2014-11-241-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added stream types for internal use by audio policy and audio flinger. Bug: 18067208. Change-Id: I90fd4df9ed5e0d8fb8c220d67e95fd0e32a06f14
* | | | am c0ac9313: Merge "Only Windows doesn\'t have <sys/uio.h>."Elliott Hughes2014-11-251-5/+8
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit 'c0ac9313e942fb7d3a027cec41904c18d8841521': Only Windows doesn't have <sys/uio.h>.
| * | | Only Windows doesn't have <sys/uio.h>.Elliott Hughes2014-11-251-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This should probably be in libcutils instead, so code that needs to care about Windows can use readv/writev. Change-Id: I7c2ceec3f742cee0e44f69fd4c88459376bd0e08
* | | | am 8eb770d3: Merge "Remove long-dead readtty."Elliott Hughes2014-11-251-1/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '8eb770d37cd9470630fdbe496f22b7a04549fef7': Remove long-dead readtty.
| * | | Remove long-dead readtty.Elliott Hughes2014-11-241-1/+0
| | | | | | | | | | | | | | | | Change-Id: I15ae14542214a3802d43892da0d03cfb33e63c96
* | | | am 456661e3: Merge "Fix Mac build."Elliott Hughes2014-11-221-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '456661e38cefe1afbf640036f710f0d481b64bf9': Fix Mac build.
| * | | Fix Mac build.Elliott Hughes2014-11-221-1/+1
| | | | | | | | | | | | | | | | Change-Id: Iae697ae257cf4b1d675e2b758dd31d5a6a71ae4d
* | | | am 0101b06f: Merge "Kill HAVE_BIG_ENDIAN, HAVE_ENDIAN_H, and ↵Elliott Hughes2014-11-221-10/+5
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | HAVE_LITTLE_ENDIAN." * commit '0101b06fa6f9863ee87e89757e70900c3a0e7bfc': Kill HAVE_BIG_ENDIAN, HAVE_ENDIAN_H, and HAVE_LITTLE_ENDIAN.
| * | | Kill HAVE_BIG_ENDIAN, HAVE_ENDIAN_H, and HAVE_LITTLE_ENDIAN.Elliott Hughes2014-11-211-10/+5
| | | | | | | | | | | | | | | | Change-Id: I9e25ac9d27e95b04fb8bf7a66c619af0139d8b8f
* | | | am 5d8a5ade: Merge "Add a pre-C++11 constexpr compatibility macro."Dan Albert2014-11-201-0/+11
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '5d8a5ade620be65e0e658dbb99e66398f3ffdc74': Add a pre-C++11 constexpr compatibility macro.
| * | | Add a pre-C++11 constexpr compatibility macro.Dan Albert2014-11-201-0/+11
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | Needed for cases where something should be constexpr if possible, but not being constexpr is fine if in pre-C++11 code (such as a const static float member variable). Bug: 18466763 Change-Id: I635d062575ba2fbc4cbe3a89f730128c404d95e1
* | | am ac252357: Merge "Remove atomic-inline.h."Elliott Hughes2014-11-173-21/+2
|\ \ \ | |/ / | | | | | | | | | * commit 'ac252357bb15cdeb7d4637a1cfeaa76810514715': Remove atomic-inline.h.
| * | Remove atomic-inline.h.Elliott Hughes2014-11-173-21/+2
| | | | | | | | | | | | Change-Id: I3ac0229b9c516744e6a9c9d9e795b43bc9c5636b
* | | am 3ef0460e: Merge "Remove the error-prone TARGET_CPU_SMP from system/core."Elliott Hughes2014-11-172-8/+0
|\ \ \ | |/ / | | | | | | | | | * commit '3ef0460e86f2a7c5442bcf424b8e83fdfb8e3669': Remove the error-prone TARGET_CPU_SMP from system/core.
| * | Remove the error-prone TARGET_CPU_SMP from system/core.Elliott Hughes2014-11-172-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | 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
* | | am 64d7117e: Merge "Second attempt to "Rewrite atomic.h to use stdatomic.h.""Hans Boehm2014-11-148-1039/+112
|\ \ \ | |/ / | | | | | | | | | * commit '64d7117efc7f7b8b477cd216a119b07041d8f406': Second attempt to "Rewrite atomic.h to use stdatomic.h."
| * | Second attempt to "Rewrite atomic.h to use stdatomic.h."Hans Boehm2014-11-138-1039/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | am 2c0839e9: Merge "kill HAVE_POSIX_FILEMAP"Yabin Cui2014-11-111-2/+2
|\ \ \ | |/ / | | | | | | | | | * commit '2c0839e9dba6d9d282f8391c3edb14236f56618d': kill HAVE_POSIX_FILEMAP
| * | kill HAVE_POSIX_FILEMAPYabin Cui2014-11-111-2/+2
| | | | | | | | | | | | | | | Bug: 18315579 Change-Id: I0bd5fb946b12cb90e0c9c73a478df41609b8c3e2
* | | am 65a83bdf: Merge "Reserve some AIDs for OEMs"Nick Kralevich2014-11-101-0/+5
|\ \ \ | |/ / | | | | | | | | | * commit '65a83bdf2ea1643449294a23a450e5a8a5b5058c': Reserve some AIDs for OEMs
| * | Merge "Reserve some AIDs for OEMs"Nick Kralevich2014-11-101-0/+5
| |\ \
| | * | Reserve some AIDs for OEMsJohan Redestig2014-11-101-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | OEMs frequently add some AIDs on their own. Reserve some range for them to use. Change-Id: I3c729c889c9bd3e105ae4f6fb0c04a42a10eb25c
* | | | am f02c7972: Merge "Move winsock2.h in front of a potential windows.h include."Stephen Hines2014-11-091-0/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'f02c7972560bc512552830c8110d026136a3a87f': Move winsock2.h in front of a potential windows.h include.
| * | | Merge "Move winsock2.h in front of a potential windows.h include."Stephen Hines2014-11-091-0/+4
| |\ \ \
| | * | | Move winsock2.h in front of a potential windows.h include.Stephen Hines2014-11-081-0/+4
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Files that included FileMap.h (possibly transitively), before including ByteOrder.h (which pulls in winsock2.h directly), will experience a compiler warning/error from the latest mingw headers. This happens because the headers require that winsock2.h come before windows.h in all cases. The simplest (and most error-proof) fix for now is to include winsock2.h before this use of windows.h. Change-Id: I33069e4c9962d9820d0ea5976554f89d7ff6307c
* | | | am aaa920d7: Merge "Make Unicode.h use types that match libc++."Dan Albert2014-11-091-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'aaa920d7969d9dd4b9e7871f2758d9092095bead': Make Unicode.h use types that match libc++.
| * | | Make Unicode.h use types that match libc++.Dan Albert2014-11-081-2/+2
| |/ / | | | | | | | | | | | | | | | | | | libc++ also defines these types for pre-C++11, and the two definitions need to match to avoid redefinition errors. Bug: 18300613 Change-Id: I1e9198d39f7c470f37bc6edba2dca2d499f54c9b
| * | resolved conflicts for merge of e3c22c41 to stage-aosp-masterCalin Juravle2014-10-281-1/+1
| |\ \ | | | | | | | | | | | | Change-Id: I566aeb2e2de15813ee199d4635098029457fdf3d
| | * | Handle code_cache dir creation in libnativebridgeCalin Juravle2014-10-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Change-Id: I39f74c93580f2e224080dd3df2ffaa9cf9f8cd9c
| * | | am 07f1300c: am 7979f1ce: Merge "Do not inline rarely used trace function ↵Chih-Hung Hsieh2014-10-151-39/+11
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | bodies." * commit '07f1300c4c4f7d3c0df540bf8df3443c3f4539cd': Do not inline rarely used trace function bodies.
| * | | am 072877af: am 41198eea: Merge "Revert "Rewrite atomic.h to use stdatomic.h.""Hans Boehm2014-10-048-124/+1039
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit '072877af485d49f11e227c0d22a7bb4a341533d6': Revert "Rewrite atomic.h to use stdatomic.h."
generated by cgit v1.1 at 2025-02-09 15:28:57 +0000