Commit graph

8342 commits

Author SHA1 Message Date
Hans Boehm
41198eea42 Merge "Revert "Rewrite atomic.h to use stdatomic.h."" 2014-10-04 01:31:49 +00:00
Hans Boehm
2789faabfa Revert "Rewrite atomic.h to use stdatomic.h."
This reverts commit cb344d4640.

Change-Id: Ib17cd8d00695062177ce863cedc4ec7148012317
2014-10-04 00:49:06 +00:00
Hans Boehm
028928fe3c Merge "Rewrite atomic.h to use stdatomic.h." 2014-10-03 23:47:36 +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
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
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
e3d3016d46 Merge "Switch from using base64 BIOs to encoding funcs." 2014-09-26 21:51:36 +00:00
Andreas Gampe
3496e327ae Merge "LibNativeBridge: Add testing" 2014-09-26 19:59:37 +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
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
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
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
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
9d1b922725 Merge "LibNativeBridge: Add early init & env setup" 2014-09-24 22:00:06 +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
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
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
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
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
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
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
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
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
Kenny Root
d372c5c365 Merge changes I11e84a7b,I5adaedd8
* changes:
  adb: fix 64-bit build
  add sideload-host mode to adb
2014-09-16 17:36:13 +00:00
Colin Cross
52e0b61999 adb: fix 64-bit build
strlen returns a size_t, but the * modifier in printf expects an int.
On arm64 size_t != int.

(cherry-picked from commit 6d6a898b0c)

Change-Id: I11e84a7b62c935162abc0aba910d14e63d11efd3
2014-09-16 10:31:30 -07:00
Christopher Ferris
23aeeff510 Merge "Use the correct fuse_init_out structure size." 2014-09-16 17:29:20 +00:00
Doug Zongker
8e49ae4bb8 add sideload-host mode to adb
The sideload-host mode turns the host into a server capable of sending
the device various pieces of the file on request, rather than
downloading it all in one transfer.  It's used to support sideloading
OTA packages to devices without the need for them to hold the whole
package in RAM.

If the connected device doesn't support sideload-host mode, we fall
back to the older sideload connection.

(cherry-picked from commit 71fe584a1a)

Change-Id: I5adaedd8243dc3b76414bba0149879ca2bbf35fa
2014-09-16 10:27:38 -07:00
Mark Salyzyn
a3e53f1dfe Merge "logcat: -v format defaults to threadtime" 2014-09-16 16:53:39 +00:00