Commit Graph

8543 Commits

Author SHA1 Message Date
Hans Boehm f5204549fa am 028928fe: Merge "Rewrite atomic.h to use stdatomic.h."
* commit '028928fe3ca42b7aab55cb49f2784caeec025a12':
  Rewrite atomic.h to use stdatomic.h.
2014-10-03 23:59:04 +00:00
Hans Boehm 028928fe3c Merge "Rewrite atomic.h to use stdatomic.h." 2014-10-03 23:47:36 +00:00
Calin Juravle 2124b521e8 am c6083626: Merge "Use initUnchangeableSystemProperty for initializing os.arch."
* commit 'c60836263e19ac15f674320e978caa577c042f12':
  Use initUnchangeableSystemProperty for initializing os.arch.
2014-10-02 17:38:03 +00:00
Calin Juravle c60836263e Merge "Use initUnchangeableSystemProperty for initializing os.arch." 2014-10-02 17:28:39 +00:00
Hans Boehm cb344d4640 Rewrite atomic.h to use stdatomic.h.
Replace atomic-inl.h with a file that just includes atomic.h.
Remove platform specific implementations.

Change-Id: If16d74fbe0af7836ed8c1296c17e13a2d0d20f64
2014-10-01 17:37:20 -07:00
Calin Juravle c3eb4314b7 Use initUnchangeableSystemProperty for initializing os.arch.
Bug: 17713104

(cherry picked from commit 00851a53be)

Change-Id: Ibddc535248a10e3534586eafb76c074332e025c4
2014-10-01 21:16:16 +01: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 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
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 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 aa1f512b93 am 3496e327: Merge "LibNativeBridge: Add testing"
* commit '3496e327ae49ac3ac537009aa70dd884b322d971':
  LibNativeBridge: Add testing
2014-09-26 20:10:06 +00:00
Andreas Gampe 3496e327ae Merge "LibNativeBridge: Add testing" 2014-09-26 19:59:37 +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 2d687fe3d8 am 9f93e297: Merge "LibNativeBridge: Fix two bugs"
* commit '9f93e297ee7df04bf605b9dc1251f7c772c48189':
  LibNativeBridge: Fix two bugs
2014-09-26 04:59:17 +00: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
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
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 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
Andreas Gampe 64884bb135 am 9d1b9227: Merge "LibNativeBridge: Add early init & env setup"
* commit '9d1b922725822a7017318f738f67831a994c8fdf':
  LibNativeBridge: Add early init & env setup
2014-09-24 22:10:18 +00:00
Andreas Gampe 9d1b922725 Merge "LibNativeBridge: Add early init & env setup" 2014-09-24 22:00:06 +00:00
Elliott Hughes 5da0e2ee2b am 49e37652: Merge "bionic has O_RSYNC now."
* commit '49e37652cd7e61612d13c630759677bcb9231153':
  bionic has O_RSYNC now.
2014-09-24 04:57:48 +00:00
Elliott Hughes 49e37652cd Merge "bionic has O_RSYNC now." 2014-09-24 04:51:03 +00:00
Elliott Hughes c2d9837c0e bionic has O_RSYNC now.
Change-Id: Idad77b6ddc0abe270edff773bb0316d30b9f894d
2014-09-23 20:12:05 -07:00
jgu21 ab0da5a9a6 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.

Change-Id: I0b93da93251c6b4638de786bf98cf99df07c3fc2
2014-09-23 20:08:25 -07:00
Elliott Hughes 790e7c0ac4 am 3772545c: Merge "Switch adb to epoll(2)."
* commit '3772545c22fb28e27d150c97f88dd3b7c0a7c741':
  Switch adb to epoll(2).
2014-09-23 18:45:35 +00:00
Elliott Hughes 3772545c22 Merge "Switch adb to epoll(2)." 2014-09-23 18:36:24 +00:00
Elliott Hughes 67de1557b0 Switch adb to epoll(2).
Bug: 17588403
Change-Id: I2590f5e7dd4e178ff4f743609c5ef0155b1015a1
2014-09-23 10:40:51 -07:00
Elliott Hughes fbb4188cfa am d559d6c7: Merge "defined(HAVE_OFF_T) is really just !defined(__APPLE__)."
* commit 'd559d6c72a411d14c7a964dad1eb7f6e229314cb':
  defined(HAVE_OFF_T) is really just !defined(__APPLE__).
2014-09-23 15:59:01 +00:00
Elliott Hughes d559d6c72a Merge "defined(HAVE_OFF_T) is really just !defined(__APPLE__)." 2014-09-23 15:51:10 +00:00
Elliott Hughes cb3d65323d defined(HAVE_OFF_T) is really just !defined(__APPLE__).
Change-Id: I83c271bfe24b777acf293d2b4ac5af2cce8398b9
2014-09-22 20:50:54 -07:00
Elliott Hughes ae3a8961f0 am fed0f06b: Merge "init: Fix memory corruption when sanitizing platform paths"
* commit 'fed0f06bf04c6de90ae7b2f8ae9158ab2200498e':
  init: Fix memory corruption when sanitizing platform paths
2014-09-23 02:05:55 +00:00
Elliott Hughes fed0f06bf0 Merge "init: Fix memory corruption when sanitizing platform paths" 2014-09-23 01:55:08 +00:00
Christopher R. Palmer 07f3fee164 init: Fix memory corruption when sanitizing platform paths
This commit fixes code that incorrectly increments s when it
hits the terminator character of the string being sanitized.
This means it will randomly start trashing memory beyond the
end of the string being sanitized until it happens to hit two
NULs (\0\0) which will break it out of the loop.

Change-Id: I76553d7f183236a78a0bc7b408e92559b98f732f
2014-09-22 20:42:25 -04:00