summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am f5204549: am 028928fe: Merge "Rewrite atomic.h to use stdatomic.h."Hans Boehm2014-10-049-1040/+132
|\ | | | | | | | | * commit 'f5204549faf7310cc808bcb3676fb36268178e26': Rewrite atomic.h to use stdatomic.h.
| * am 028928fe: Merge "Rewrite atomic.h to use stdatomic.h."Hans Boehm2014-10-039-1040/+132
| |\ | | | | | | | | | | | | * commit '028928fe3ca42b7aab55cb49f2784caeec025a12': Rewrite atomic.h to use stdatomic.h.
| | * Merge "Rewrite atomic.h to use stdatomic.h."Hans Boehm2014-10-039-1040/+132
| | |\
| | | * Rewrite atomic.h to use stdatomic.h.Hans Boehm2014-10-019-1040/+132
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace atomic-inl.h with a file that just includes atomic.h. Remove platform specific implementations. Change-Id: If16d74fbe0af7836ed8c1296c17e13a2d0d20f64
* | | | am c263e671: Merge "init.trace.rc: fix race condition with class_start core" ↵Jesse Hall2014-10-021-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev * commit 'c263e671dfbc5d968275f6c088f05c21d1528325': init.trace.rc: fix race condition with class_start core
| * \ \ \ Merge "init.trace.rc: fix race condition with class_start core" into lmp-devJesse Hall2014-10-021-1/+1
| |\ \ \ \
| | * | | | init.trace.rc: fix race condition with class_start coreFred Fettinger2014-10-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The systrace permissions from init.trace.rc and the "class_start core" which launches surfaceflinger are both in an "on boot" section. However, the init.trace.rc commands are parsed after all commands in init.rc. This means that "class_start core" is executed before the chmod command which allows processes to write to trace_marker. If any services execute their first trace command before the chmod occurs, then that service won't be able to write traces until the service is restarted. To fix this, run all of the init.trace.rc commands in the "early-boot" section to ensure they are completed first. Bug: 17612265 Change-Id: Ibf544762173d5ba98272c66ef485d8eab7d70bf3
* | | | | | am 2124b521: am c6083626: Merge "Use initUnchangeableSystemProperty for ↵Calin Juravle2014-10-020-0/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | initializing os.arch." * commit '2124b521e86ee778880eb42cd40c5820d625890e': Use initUnchangeableSystemProperty for initializing os.arch.
| * | | | | am c6083626: Merge "Use initUnchangeableSystemProperty for initializing ↵Calin Juravle2014-10-021-5/+5
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | os.arch." * commit 'c60836263e19ac15f674320e978caa577c042f12': Use initUnchangeableSystemProperty for initializing os.arch.
| | * | | | Merge "Use initUnchangeableSystemProperty for initializing os.arch."Calin Juravle2014-10-021-5/+5
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | * | | Use initUnchangeableSystemProperty for initializing os.arch.Calin Juravle2014-10-011-5/+5
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17713104 (cherry picked from commit 00851a53bebe16dd2a0460245505461f40a7a307) Change-Id: Ibddc535248a10e3534586eafb76c074332e025c4
* | | | | am 2f431a8d: Fix windows-specific error without messing up Makefile flags.Stephen Hines2014-10-024-5/+3
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | * commit '2f431a8d5a1c2029af470a7336751a555131ee51': Fix windows-specific error without messing up Makefile flags.
| * | | | Fix windows-specific error without messing up Makefile flags.Stephen Hines2014-10-014-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14416410 The proper fix for the error/warning we encountered is to move winsock2.h in front of windows.h. Change-Id: I29504ba3a184a85c6636d06c2ad900828fdb5436
* | | | | am 3ea87c33: Fix build breakage for missing -Wcpp option on old GCC versions.Stephen Hines2014-10-021-1/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit '3ea87c33a1c6e940322f5436cf0dd70a0bdadd75': Fix build breakage for missing -Wcpp option on old GCC versions.
| * | | | Fix build breakage for missing -Wcpp option on old GCC versions.Stephen Hines2014-10-011-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14416410 Change-Id: Ib30c3739d50d6122b3b4643051c72f2fa4985686
* | | | | am 64f44b84: Merge "Remove obsolete reference to ddk; Fixes for -Werror" ↵Stephen Hines2014-10-015-6/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev * commit '64f44b8444dabd69cf391d42e10d44e8e926a79d': Remove obsolete reference to ddk; Fixes for -Werror
| * | | | Merge "Remove obsolete reference to ddk; Fixes for -Werror" into lmp-devStephen Hines2014-10-015-6/+4
| |\ \ \ \
| | * | | | Remove obsolete reference to ddk; Fixes for -WerrorAndrew Hsieh2014-09-305-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14416410 1. The new mingw-w64 toolchain x86_64-w64-mingw32-4.8 has ddk in x86_64-w64-mingw32/include/ddk 2. Add -Wno-error=cpp to suppress a warning that turns into error thanks to -Werror: Please include winsock2.h before windows.h 3. Cast GetLastError() return type DWORD to "int" 4. Include direct.h for _mkdir 5. Include stdint.h for uint8_t on Windows Change-Id: I4bec0587f6573692f08c760da6c98ae551b8b5eb
* | | | | | am 00851a53: Use initUnchangeableSystemProperty for initializing os.arch.Calin Juravle2014-10-011-5/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '00851a53bebe16dd2a0460245505461f40a7a307': Use initUnchangeableSystemProperty for initializing os.arch.
| * | | | | Use initUnchangeableSystemProperty for initializing os.arch.Calin Juravle2014-10-011-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17713104 Change-Id: Ic847579981efcd2fd0526c994d786ee8b7a8a316
* | | | | | am 479ce0c1: Merge "Fix mac build for nativebridge tests." into lmp-devBrian Carlstrom2014-09-300-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '479ce0c1f3d9ecbaf7947651a5e00828ec522f15': Fix mac build for nativebridge tests.
| * | | | | Merge "Fix mac build for nativebridge tests." into lmp-devBrian Carlstrom2014-09-301-2/+2
| |\ \ \ \ \
| | * | | | | Fix mac build for nativebridge tests.Calin Juravle2014-09-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17671501 Change-Id: Id0d729a25a5cea2fed5005cdea750e9e94f46d21
* | | | | | | am c75dac39: Merge "fix for adbd pinning CPU" into lmp-devVince Harron2014-09-301-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c75dac394e3fcd9760841a820d8a0c93dd0c276e': fix for adbd pinning CPU
| * | | | | | Merge "fix for adbd pinning CPU" into lmp-devVince Harron2014-09-301-1/+1
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | fix for adbd pinning CPUVince Harron2014-09-251-1/+1
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | adbd was spinning between select & read (0 bytes) for an adb_auth socket. The read documentation states: "On success, the number of bytes read is returned (zero indicates end of file)" so the code has been modified to close the connection (like the read error case). BUG=17419868 Change-Id: I1d8fb70c8e1876225ba8d47ea0a2b6265a7d182b
* | | | | | am c4133a6e: am fc1357cf: Merge "logd: in nonblocking read, sched_yield() ↵Mark Salyzyn2014-09-290-0/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | synchronization" * commit 'c4133a6e28e586f598e5c92f2b9e769178d92b3f': logd: in nonblocking read, sched_yield() synchronization
| * | | | | am fc1357cf: Merge "logd: in nonblocking read, sched_yield() synchronization"Mark Salyzyn2014-09-291-0/+5
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | * commit 'fc1357cffbbe999c8d4065b89ce0435f35243a82': logd: in nonblocking read, sched_yield() synchronization
| | * | | | Merge "logd: in nonblocking read, sched_yield() synchronization"Mark Salyzyn2014-09-291-0/+5
| | |\ \ \ \
| | | * | | | logd: in nonblocking read, sched_yield() synchronizationMark Salyzyn2014-09-291-0/+5
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - sched_yield and lock synchronization in reader thread startup to give writer thread a chance to catch up Bug: 17512203 Change-Id: I43cf0b4e2829b22b3ab4e537fa95ce13c76a869c
* | | | | | am f0699c11: am 68c19686: Merge "Fix mac build for nativebridge tests."Andreas Gampe2014-09-291-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f0699c11debade875e87efad27d37ddf6fa83ed6': Fix mac build for nativebridge tests.
| * | | | | am 68c19686: Merge "Fix mac build for nativebridge tests."Andreas Gampe2014-09-291-2/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '68c19686e8f9b5a88e3b2729a453d03516be79f1': Fix mac build for nativebridge tests.
| | * | | | Merge "Fix mac build for nativebridge tests."Andreas Gampe2014-09-291-2/+2
| | |\ \ \ \
| | | * | | | Fix mac build for nativebridge tests.Calin Juravle2014-09-291-2/+2
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17671501 (cherry picked from commit 2e5e8cc92081da6b0af658d12a60334acea441a1) Change-Id: Id0d729a25a5cea2fed5005cdea750e9e94f46d21
* | | | | | am 7391575a: logd: in nonblocking read, sched_yield() synchronizationMark Salyzyn2014-09-291-0/+5
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | * commit '7391575afdd6c27bf444dcde7a140f1b17629b8c': logd: in nonblocking read, sched_yield() synchronization
| * | | | | logd: in nonblocking read, sched_yield() synchronizationMark Salyzyn2014-09-291-0/+5
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - sched_yield and lock synchronization in reader thread startup to give writer thread a chance to catch up (cherry picked from commit f669acb01880216b6c1d29fc226f2c3ec3a6368a) Bug: 17512203 Change-Id: I43cf0b4e2829b22b3ab4e537fa95ce13c76a869c
* | | | | am 9c970bd9: am aa68f3e9: Merge "logd: auditd: report facility LOG_AUTH"Mark Salyzyn2014-09-291-4/+15
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * commit '9c970bd926da8f71daad801de96460edb55b69c7': logd: auditd: report facility LOG_AUTH
| * | | | am aa68f3e9: Merge "logd: auditd: report facility LOG_AUTH"Mark Salyzyn2014-09-291-4/+15
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | * commit 'aa68f3e9dd673fee8a96c80b9f4bb816cd42e680': logd: auditd: report facility LOG_AUTH
| | * | | Merge "logd: auditd: report facility LOG_AUTH"Mark Salyzyn2014-09-281-4/+15
| | |\ \ \
| | | * | | logd: auditd: report facility LOG_AUTHMark Salyzyn2014-09-281-4/+15
| | |/ / / | | | | | | | | | | | | | | | Change-Id: Ie325e1b58f52b6c728d5cfd6f6b87287fcf32e10
* | | | | am b3facbfd: LibNativeBridge: Add early init & env setupjgu212014-09-290-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | * commit 'b3facbfdecf46eb7c063b99529ab8c18a08a6b42': LibNativeBridge: Add early init & env setup
| * | | | LibNativeBridge: Add early init & env setupjgu212014-09-267-12/+388
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a method to set up /proc/cpuinfo with enough privileges. Set up the environment for an app in InitializeNativeBridge(). Turn on -Wall for libnativebridge. (cherry picked from commit 962eb40abb68eb60077da158755b6a09c306aa41) (cherry picked from commit ab0da5a9a6860046619629b8e6b83692d35dff86) (cherry picked from commit 2f71cb24fa16c0388591918f1354d1f8608cc6e5) (cherry picked from commit 04054e28e24866d76034236843490829b80df40c) (cherry picked from commit 4390a632366ecf89af5f6c0fed39baf9aab2d0f1) Bug: 17671501 Change-Id: Id4f4127d82737b5e56a77175e1068ff5cea60f9d
* | | | am 9005ec37: am e3d3016d: Merge "Switch from using base64 BIOs to encoding ↵Alex Klyubin2014-09-261-19/+47
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | funcs." * commit '9005ec378ecd281f52945b5baca87245543bbfbf': Switch from using base64 BIOs to encoding funcs.
| * | | am e3d3016d: Merge "Switch from using base64 BIOs to encoding funcs."Alex Klyubin2014-09-261-19/+47
| |\ \ \ | | | |/ | | |/| | | | | | | | | * commit 'e3d3016d46f53a75d4ae94fcbcb95a5593eb00a0': Switch from using base64 BIOs to encoding funcs.
| | * | Merge "Switch from using base64 BIOs to encoding funcs."Alex Klyubin2014-09-261-19/+47
| | |\ \
| | | * | Switch from using base64 BIOs to encoding funcs.Adam Langley2014-09-051-19/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The OpenSSL base64 BIO is going away in BoringSSL. This change switches to using the explicit base64 functions which are availible in both OpenSSL and BoringSSL. The BoringSSL helper functions (i.e. for calculating the size of the base64 encoding) are wrapped in #ifdefs so that this change isn't coupled with the switch to BoringSSL. Once that switch is complete, the #ifdefs can be removed. Bug: 17409664 Change-Id: I42bac3bc93a1fb39feed39a8917d8e38d97629d3 Signed-off-by: Adam Langley <agl@google.com>
* | | | | am aa1f512b: am 3496e327: Merge "LibNativeBridge: Add testing"Andreas Gampe2014-09-264-4/+129
|\| | | | | | | | | | | | | | | | | | | | | | | | * commit 'aa1f512b93ada06d76c5b2d2692e1a131b38bfd0': LibNativeBridge: Add testing
| * | | | am 3496e327: Merge "LibNativeBridge: Add testing"Andreas Gampe2014-09-264-4/+129
| |\| | | | | | | | | | | | | | | | | | | | | | | * commit '3496e327ae49ac3ac537009aa70dd884b322d971': LibNativeBridge: Add testing
| | * | | Merge "LibNativeBridge: Add testing"Andreas Gampe2014-09-264-4/+129
| | |\ \ \
| | | * | | LibNativeBridge: Add testingAndreas Gampe2014-09-254-4/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change PreInitializeNativeBridge to have a different path for the host to allow testing. Add a test (needs root privileges). Add a test for NeedsNativeBridge. Change error reporting to use strerror. Change-Id: Id2d488f0484ff8b0438863b48ef43770e784505f