Commit graph

8528 commits

Author SHA1 Message Date
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
Dan Albert
ffbb05e674 am fbe58079: Merge "Fix warning for uninitialized variable."
* commit 'fbe58079b4ac12462f1ad7a23ff745919621b8dd':
  Fix warning for uninitialized variable.
2014-09-22 23:11:29 +00:00
Dan Albert
fbe58079b4 Merge "Fix warning for uninitialized variable." 2014-09-22 23:01:12 +00:00
Dan Albert
5c957e2d4f Fix warning for uninitialized variable.
Change-Id: I78e6a20562419dcc2fb3f579089b32aeb5538f8b
2014-09-22 15:26:39 -07:00
Mark Salyzyn
7e2af0ccc3 am 810814d0: Merge "logd: auditd: kmsg priority"
* commit '810814d09b7e4da9744fc5991ee49b9d8e7c9755':
  logd: auditd: kmsg priority
2014-09-19 19:14:37 +00:00
Mark Salyzyn
810814d09b Merge "logd: auditd: kmsg priority" 2014-09-19 19:07:30 +00:00
Mark Salyzyn
6bdeee0ce6 logd: auditd: kmsg priority
Change-Id: I2016fe140e2daf6c69efbd10aef205fffb931aa1
2014-09-19 11:59:42 -07:00
Mark Salyzyn
b210403a8b am 98d3aa3f: Merge "logcat: tests: deal with -v threadtime default"
* commit '98d3aa3f0d76190dbeea6248fffe326f7b6fe47d':
  logcat: tests: deal with -v threadtime default
2014-09-18 17:35:26 +00:00
Mark Salyzyn
98d3aa3f0d Merge "logcat: tests: deal with -v threadtime default" 2014-09-18 17:27:56 +00:00
Mark Salyzyn
a5e2429f09 logcat: tests: deal with -v threadtime default
- specify -v brief where necessary to preserve tests
- fix an occasional issue for logrotate and device block size

Change-Id: I09b02cc0359dc351a89311abc3ee762a0f23582c
2014-09-18 10:25:38 -07:00
Elliott Hughes
6c03b85f1d am 32e2f1be: Merge "Clean up memset[16,32] routines: unify files names, remove redundant wrapper for 32-bit, remove Atom caches sizes for 64-bit, fix license."
* commit '32e2f1be039482762303378113c817ba99466953':
  Clean up memset[16,32] routines: unify files names, remove redundant wrapper for 32-bit, remove Atom caches sizes for 64-bit, fix license.
2014-09-18 03:08:38 +00:00
Elliott Hughes
32e2f1be03 Merge "Clean up memset[16,32] routines: unify files names, remove redundant wrapper for 32-bit, remove Atom caches sizes for 64-bit, fix license." 2014-09-18 03:02:05 +00:00
Varvara Rainchik
458d1253f5 Clean up memset[16,32] routines: unify files names, remove redundant wrapper
for 32-bit, remove Atom caches sizes for 64-bit, fix license.

Change-Id: Ieda6367d7b21cf25b2beda6dd8d77cf668d3f2af
Signed-off-by: Varvara Rainchik <varvara.rainchik@intel.com>
2014-09-17 18:11:18 +04:00
Kenny Root
46679c1dce am 8d35442b: Merge "fix windows build"
* commit '8d35442b18e9dddfdde89c81e0cc910c70a12202':
  fix windows build
2014-09-16 18:12:06 +00:00
Kenny Root
8d35442b18 Merge "fix windows build" 2014-09-16 18:00:47 +00:00
Doug Zongker
edda73d0c8 fix windows build
(cherry-picked from commit 4b39c6aca9)

Change-Id: Ia7b236f1a915630fe85d488072efb9784ba10dad
2014-09-16 10:59:49 -07:00