Brian Carlstrom
479ce0c1f3
Merge "Fix mac build for nativebridge tests." into lmp-dev
2014-09-30 04:19:54 +00:00
Vince Harron
c75dac394e
Merge "fix for adbd pinning CPU" into lmp-dev
2014-09-30 03:01:07 +00:00
Mark Salyzyn
b30a0ada05
am c4133a6e
: am fc1357cf
: Merge "logd: in nonblocking read, sched_yield() synchronization"
...
* commit 'c4133a6e28e586f598e5c92f2b9e769178d92b3f':
logd: in nonblocking read, sched_yield() synchronization
2014-09-29 22:01:59 +00:00
Andreas Gampe
3bfa57e1e3
am f0699c11
: am 68c19686
: Merge "Fix mac build for nativebridge tests."
...
* commit 'f0699c11debade875e87efad27d37ddf6fa83ed6':
Fix mac build for nativebridge tests.
2014-09-29 22:01:58 +00:00
Mark Salyzyn
c61301cc67
am 7391575a
: logd: in nonblocking read, sched_yield() synchronization
...
* commit '7391575afdd6c27bf444dcde7a140f1b17629b8c':
logd: in nonblocking read, sched_yield() synchronization
2014-09-29 20:49:24 +00:00
Mark Salyzyn
c4133a6e28
am fc1357cf
: Merge "logd: in nonblocking read, sched_yield() synchronization"
...
* commit 'fc1357cffbbe999c8d4065b89ce0435f35243a82':
logd: in nonblocking read, sched_yield() synchronization
2014-09-29 20:48:05 +00:00
Andreas Gampe
f0699c11de
am 68c19686
: Merge "Fix mac build for nativebridge tests."
...
* commit '68c19686e8f9b5a88e3b2729a453d03516be79f1':
Fix mac build for nativebridge tests.
2014-09-29 20:48:04 +00:00
Mark Salyzyn
7391575afd
logd: in nonblocking read, sched_yield() synchronization
...
- sched_yield and lock synchronization in reader thread
startup to give writer thread a chance to catch up
(cherry picked from commit f669acb018
)
Bug: 17512203
Change-Id: I43cf0b4e2829b22b3ab4e537fa95ce13c76a869c
2014-09-29 11:09:22 -07:00
Mark Salyzyn
fc1357cffb
Merge "logd: in nonblocking read, sched_yield() synchronization"
2014-09-29 17:41:11 +00:00
Mark Salyzyn
f669acb018
logd: in nonblocking read, sched_yield() synchronization
...
- sched_yield and lock synchronization in reader thread
startup to give writer thread a chance to catch up
Bug: 17512203
Change-Id: I43cf0b4e2829b22b3ab4e537fa95ce13c76a869c
2014-09-29 17:40:10 +00:00
Andreas Gampe
68c19686e8
Merge "Fix mac build for nativebridge tests."
2014-09-29 14:59:50 +00:00
Calin Juravle
c00994df05
Fix mac build for nativebridge tests.
...
Bug: 17671501
(cherry picked from commit 2e5e8cc92081da6b0af658d12a60334acea441a1)
Change-Id: Id0d729a25a5cea2fed5005cdea750e9e94f46d21
2014-09-29 07:58:15 -07:00
Calin Juravle
7e5a0aca2c
Fix mac build for nativebridge tests.
...
Bug: 17671501
Change-Id: Id0d729a25a5cea2fed5005cdea750e9e94f46d21
2014-09-29 15:57:43 +01:00
Mark Salyzyn
bc532a93d4
am 9c970bd9
: am aa68f3e9
: Merge "logd: auditd: report facility LOG_AUTH"
...
* commit '9c970bd926da8f71daad801de96460edb55b69c7':
logd: auditd: report facility LOG_AUTH
2014-09-29 05:41:39 +00:00
jgu21
c201c91b4b
am b3facbfd
: LibNativeBridge: Add early init & env setup
...
* commit 'b3facbfdecf46eb7c063b99529ab8c18a08a6b42':
LibNativeBridge: Add early init & env setup
2014-09-29 03:28:03 +00:00
Mark Salyzyn
9c970bd926
am aa68f3e9
: Merge "logd: auditd: report facility LOG_AUTH"
...
* commit 'aa68f3e9dd673fee8a96c80b9f4bb816cd42e680':
logd: auditd: report facility LOG_AUTH
2014-09-29 00:00:08 +00:00
Mark Salyzyn
aa68f3e9dd
Merge "logd: auditd: report facility LOG_AUTH"
2014-09-28 22:41:29 +00:00
Mark Salyzyn
7ee2aef8e0
logd: auditd: report facility LOG_AUTH
...
Change-Id: Ie325e1b58f52b6c728d5cfd6f6b87287fcf32e10
2014-09-28 14:42:05 -07:00
Alex Klyubin
1f88f8ef32
am 9005ec37
: am e3d3016d
: Merge "Switch from using base64 BIOs to encoding funcs."
...
* commit '9005ec378ecd281f52945b5baca87245543bbfbf':
Switch from using base64 BIOs to encoding funcs.
2014-09-26 21:58:52 +00:00
Alex Klyubin
9005ec378e
am e3d3016d
: Merge "Switch from using base64 BIOs to encoding funcs."
...
* commit 'e3d3016d46f53a75d4ae94fcbcb95a5593eb00a0':
Switch from using base64 BIOs to encoding funcs.
2014-09-26 21:54:37 +00:00
Alex Klyubin
e3d3016d46
Merge "Switch from using base64 BIOs to encoding funcs."
2014-09-26 21:51:36 +00:00
Andreas Gampe
e3448987c4
am aa1f512b
: am 3496e327
: Merge "LibNativeBridge: Add testing"
...
* commit 'aa1f512b93ada06d76c5b2d2692e1a131b38bfd0':
LibNativeBridge: Add testing
2014-09-26 20:14:18 +00:00
Andreas Gampe
aa1f512b93
am 3496e327
: Merge "LibNativeBridge: Add testing"
...
* commit '3496e327ae49ac3ac537009aa70dd884b322d971':
LibNativeBridge: Add testing
2014-09-26 20:10:06 +00:00
jgu21
b3facbfdec
LibNativeBridge: Add early init & env setup
...
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 962eb40abb
)
(cherry picked from commit ab0da5a9a6
)
(cherry picked from commit 2f71cb24fa
)
(cherry picked from commit 04054e28e2
)
(cherry picked from commit 4390a63236
)
Bug: 17671501
Change-Id: Id4f4127d82737b5e56a77175e1068ff5cea60f9d
2014-09-26 13:04:36 -07:00
Andreas Gampe
3496e327ae
Merge "LibNativeBridge: Add testing"
2014-09-26 19:59:37 +00:00
Dan Albert
c4affb2b4e
am be0d295d
: am 19d686ee
: Merge "Don\'t manually link stlport."
...
* commit 'be0d295da912076239a1e112c4b7b94be10cf7af':
Don't manually link stlport.
2014-09-26 19:53:04 +00:00
Dan Albert
be0d295da9
am 19d686ee
: Merge "Don\'t manually link stlport."
...
* commit '19d686ee9340c81c23083fc30bc012f7f6ed5028':
Don't manually link stlport.
2014-09-26 19:45:28 +00:00
Dan Albert
19d686ee93
Merge "Don't manually link stlport."
2014-09-26 19:39:44 +00:00
Dan Albert
b50af2bc60
Don't manually link stlport.
...
Change-Id: I60d2bc868fb9052f120103e9675046ef54f510d0
2014-09-26 10:37:30 -07:00
Andreas Gampe
04054e28e2
LibNativeBridge: Add testing
...
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
2014-09-25 23:18:31 -07:00
Andreas Gampe
a29febd13b
am 2d687fe3
: am 9f93e297
: Merge "LibNativeBridge: Fix two bugs"
...
* commit '2d687fe3d8af29e79ee13e5d6c3d71113d6f575a':
LibNativeBridge: Fix two bugs
2014-09-26 05:14:08 +00:00
Andreas Gampe
2d687fe3d8
am 9f93e297
: Merge "LibNativeBridge: Fix two bugs"
...
* commit '9f93e297ee7df04bf605b9dc1251f7c772c48189':
LibNativeBridge: Fix two bugs
2014-09-26 04:59:17 +00:00
Vince Harron
af436b1e10
fix for adbd pinning CPU
...
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
2014-09-25 21:51:15 -07:00
Andreas Gampe
9f93e297ee
Merge "LibNativeBridge: Fix two bugs"
2014-09-26 04:47:10 +00:00
Andreas Gampe
2f71cb24fa
LibNativeBridge: Fix two bugs
...
Instruction set comparison must include the termination character
so that prefixes are not identified as equal.
Mount argument order was wrong.
Change-Id: Ib70e36ce2ea5af158ebc9d7fafd00e978348d73d
2014-09-25 21:34:25 -07:00
Andreas Gampe
8b95b06564
am 8dd3ea58
: (-s ours) Merge "Revert "DO NOT MERGE Libnativebridge: Temporarily change back to late dlopen"" into lmp-dev
...
* commit '8dd3ea58fdd99912f631156c37bcb2555ce8aec3':
Revert "DO NOT MERGE Libnativebridge: Temporarily change back to late dlopen"
2014-09-25 23:43:51 +00:00
Dan Albert
736fd4a870
am 8e1e5415
: am 5b4a1767
: Merge "Revert "Switch adb to epoll(2).""
...
* commit '8e1e54154bc7a5e9dee206735474186c2276b111':
Revert "Switch adb to epoll(2)."
2014-09-25 22:32:18 +00:00
Dan Albert
8e1e54154b
am 5b4a1767
: Merge "Revert "Switch adb to epoll(2).""
...
* commit '5b4a1767f6e4802c99071305e5b69b1ed22ad292':
Revert "Switch adb to epoll(2)."
2014-09-25 22:26:16 +00:00
Dan Albert
5b4a1767f6
Merge "Revert "Switch adb to epoll(2).""
2014-09-25 22:17:13 +00:00
Dan Albert
45741ae2ea
Revert "Switch adb to epoll(2)."
...
This reverts commit 67de1557b0
.
2014-09-25 15:10:34 -07:00
Andreas Gampe
8dd3ea58fd
Merge "Revert "DO NOT MERGE Libnativebridge: Temporarily change back to late dlopen"" into lmp-dev
2014-09-25 21:55:34 +00:00
Andreas Gampe
25bacb3ab7
Revert "DO NOT MERGE Libnativebridge: Temporarily change back to late dlopen"
...
This reverts commit f00de413ed
.
Bug: 17645833
Change-Id: Ie5480de9cf4da2c9167db2e6137679019a29f867
2014-09-25 21:46:56 +00:00
Ian Rogers
fee8ffb8da
am 8a65899e
: am f502b384
: Merge "LibNativeBridge: Fix mac build warning"
...
* commit '8a65899e8a58047c1a29e243719ec25bf59a3448':
LibNativeBridge: Fix mac build warning
2014-09-25 03:55:47 +00:00
Ian Rogers
8a65899e8a
am f502b384
: Merge "LibNativeBridge: Fix mac build warning"
...
* commit 'f502b3842739503e9f09675fc02787b8982dc58f':
LibNativeBridge: Fix mac build warning
2014-09-25 03:50:07 +00:00
Ian Rogers
f502b38427
Merge "LibNativeBridge: Fix mac build warning"
2014-09-25 03:44:40 +00:00
Andreas Gampe
4390a63236
LibNativeBridge: Fix mac build warning
...
Change-Id: I5a819cb5edb064b8a7288b5f2b3100c515421adf
2014-09-24 20:14:28 -07:00
Andreas Gampe
aa60a911d0
am 44f20f70
: am 13f00594
: Merge "LibNativeHelper: No bind mount on mac"
...
* commit '44f20f7055cb2d7af7d01a702fe0648e34647aba':
LibNativeHelper: No bind mount on mac
2014-09-24 23:55:35 +00:00
Andreas Gampe
44f20f7055
am 13f00594
: Merge "LibNativeHelper: No bind mount on mac"
...
* commit '13f00594f89721cee6cd983a190b8da141e1a34b':
LibNativeHelper: No bind mount on mac
2014-09-24 23:46:57 +00:00
Andreas Gampe
13f00594f8
Merge "LibNativeHelper: No bind mount on mac"
2014-09-24 23:40:28 +00:00
Andreas Gampe
962eb40abb
LibNativeHelper: No bind mount on mac
...
Cannot bind-mount /proc/cpuinfo on the mac.
Change-Id: Id5f0cd46ba0eba484477c56bbecf14d95e88d6f2
2014-09-24 16:36:17 -07:00