Commit graph

8332 commits

Author SHA1 Message Date
Dan Albert
fbb8db2e2a Remove makefile cruft.
Don't manually include stlport, and don't use private bionic headers.

Change-Id: I0fc4e8b34ab449e9ef07c26f71e472fca5640590
2014-09-12 10:36:26 -07:00
Elliott Hughes
082a52b57f Merge "Move libutils over to pthread_gettid_np." 2014-09-12 17:22:58 +00:00
Elliott Hughes
7bf5f209ce Move libutils over to pthread_gettid_np.
Bug: 17476168
Change-Id: I934d93a023eb00e036ed3cee8c52efaeb17b8915
2014-09-12 10:19:08 -07:00
Mark Salyzyn
f9b9693bab Merge "liblog: logcat: colored output." 2014-09-12 14:27:49 +00:00
Pierre Zurek
ead88fca6e liblog: logcat: colored output.
This patch adds a new '-v color' option to logcat so that the output is
colored similar to the ones in DDMS. Simply type "adb logcat -v color"
to use it. Works well with bash in gnome-terminal. NO GUARANTEE IT WILL
WORK ON A NON xterm STYLE TERMINAL.

Signed-off-by: Michael Zimmermann <sigmaepsilon92@gmail.com>
Signed-off-by: Mark Salyzyn <salyzyn@google.com>
Change-Id: I9189c5f27fed991579edbcbc6834536eb8112152
2014-09-11 19:04:17 -07:00
Esteban de la Canal
9dd83dc96e 74602: Fixes adb not seeing connected devices on Mac.
Every alternate time an adb server was started already connected devices were
not being seen. This was caused by opened usb connections being "stalled".
See this thread for more information: http://lists.apple.com/archives/usb/2011/Jun/msg00050.html

Change-Id: Ic35b7a66c3f14a837b960066557f44e105609dcb
Fixes: https://code.google.com/p/android/issues/detail?id=74602
2014-09-11 11:36:50 -07:00
Dan Albert
91baad56f3 Merge "Fix some clang compilation issues." 2014-09-11 17:17:56 +00:00
Dan Albert
949aa23898 Fix some clang compilation issues.
Use expected inline behavior with clang.

GCC defaults to -std=gnu90, giving C89 inline semantics with GNU
extensions. Clang defaults to C99. Explicitly use gnu90.

Mark an unused parameter as __unused.

Fix some incorrect casts.

Change-Id: I05b95585d5e3688eda71769b63b6b8a9237bcaf4
2014-09-11 17:17:32 +00:00
Elliott Hughes
c4ff03899d Merge "adb: Add USB vendor ID for Alco Digital Devices Limited" 2014-09-10 18:13:07 +00:00
Chih-Hung Hsieh
da3510b272 Merge "Avoid partial initialization warning." 2014-09-10 16:32:53 +00:00
DanielMo
553630e423 adb: Add USB vendor ID for Alco Digital Devices Limited
Change-Id: I50d343d583e688e9f8a72d1c61618b384e310fe1
Signed-off-by: DanielMo <DanielMo@fih-foxconn.com>
2014-09-10 13:58:32 +08:00
Chih-Hung Hsieh
e32b8952a6 Avoid partial initialization warning.
Clang compiler is picky about partial initialization and
here we only need to initialize the 'len' field.

BUG: 17410010
Change-Id: I718582cef96d5f4076b5ff1c7b8162327e7809b6
2014-09-08 14:41:28 +00:00
Christopher Ferris
2c80588340 Merge "Add -Wno-deprecated-declarations to makefiles." 2014-09-06 16:56:46 +00:00
Chih-Hung Hsieh
299a32c803 Merge "Include ADB_HOST only code in #if ADB_HOST." 2014-09-05 23:38:07 +00:00
Chih-Hung Hsieh
f787b381b6 Include ADB_HOST only code in #if ADB_HOST.
BUG: 17409892
Change-Id: Ic1199dd745191aba718fdb18343e87c0ccbe530b
2014-09-05 16:34:02 -07:00
Elliott Hughes
9c814648ae Merge "Add USB Vendor ID for Micromax Informatics Ltd." 2014-09-05 23:07:08 +00:00
Abhishek Karmakar
4d10523be8 Add USB Vendor ID for Micromax Informatics Ltd.
Signed-off-by: Abhishek Karmakar <abhishek.karmakar@micromaxinfo.com>
Change-Id: I63462eb15575cc953ac0246ee5d4c883d3678c08
2014-09-05 16:06:25 -07:00
Adam Langley
179d9d6587 Switch from using base64 BIOs to encoding funcs.
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>
2014-09-05 15:54:30 -07:00
Christopher Ferris
51448eb39e Add -Wno-deprecated-declarations to makefiles.
This is in preparation for an update to the uapi v3.16.1
kernel headers that marks the structure usb_functionfs_descs_head
as deprecated.

Change-Id: I25d2f32ce8e95e038e6df201ce2f8126f5a8b6fa
2014-09-04 16:13:42 -07:00
Mark Salyzyn
1ac35b0996 Merge "Fix for parenthesis error" 2014-09-04 22:45:49 +00:00
Andreas Gampe
88d1bc0ebd Merge "NativeBridge: Refactor for new initialization flow" 2014-09-04 21:47:30 +00:00
Andreas Gampe
035bd7541e NativeBridge: Refactor for new initialization flow
Setup becomes Load, have explicit Initialize and Unload.

Change-Id: I5a20de1cb68dd1802937b369b14c50c9c1031c67
2014-09-04 12:57:54 -07:00
Arseniy Antonov
c3ce224c62 Fix for parenthesis error
Added parentheses as it was suggested by compiler.
error: suggest parentheses around operand of '!' or change '&' to '&&' or '!' to '~' [-Werror=parentheses]

Change-Id: Ic3746d9804488411d10d460ddfda11f1fad8efef
Signed-off-by: Arseniy Antonov <arseniy.antonov@intel.com>
2014-09-03 17:29:20 +04:00
Mark Salyzyn
35a76df583 Merge "logcat: document help tail from time" 2014-09-02 21:35:15 +00:00
Nick Kralevich
1cbf432918 Merge "Remove obsolete warning from restorecon_recursive documentation." 2014-09-02 15:39:07 +00:00
Stephen Smalley
d9c19b0c15 Remove obsolete warning from restorecon_recursive documentation.
We originally included a warning to not invoke restorecon_recursive
with a path leading to a shell-writable or app-writable directory
due to concerns about the potential for mischief with symlinks during
the restorecon_recursive.  However, this warning was never necessary for
calling restorecon_recursive during system initialization before an adb
shell or app can run, and we have further prohibited init from
reading/following symlinks that can be created by shell or apps in
policy, so this warning is superfluous.  It also contradicts current
usage of restorecon_recursive in rootdir/init.rc, since it is called
there on /data.

Change-Id: I28a635e0b5991ced8adcef93e7a04f9d9e5634fd
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2014-09-02 09:34:53 -04:00
Mark Salyzyn
190b7ac9d2 logcat: document help tail from time
(cherry picked from commit 6a594683ec)

Bug: 17323719
Change-Id: Id057dde60e699c946828f4aeabedf1728b3bc877
2014-09-01 11:45:53 -07:00
Elliott Hughes
7a1973ece3 Merge "remove examples of unimplemented triggers ( device-added device-removed ) from init/readme.txt" 2014-08-29 22:15:17 +00:00
Trevor Drake
d028394a27 remove examples of unimplemented triggers ( device-added device-removed )
from init/readme.txt

Change-Id: I16e226d8f563a223ae20044fff30498883bc4ae2
2014-08-29 20:07:28 +01:00
Elliott Hughes
d1d11fcbe5 Merge "Build the optional 'r' tool separately." 2014-08-29 16:27:23 +00:00
Elliott Hughes
660e750b12 Build the optional 'r' tool separately.
You can't use $(TARGET_BUILD_VARIANT) to change how a module
is built like this makefile used to.

Change-Id: Ie6a274cab9a77eb2376a9494e9c17aae8ba0ee0b
Signed-off-by: Olivier Fourdan <olivier.fourdan@intel.com>
Signed-off-by: Guilhem IMBERTON <guilhem.imberton@intel.com>
2014-08-28 20:44:20 -07:00
Brian Carlstrom
188d4396b8 Merge "Change /dalvik-cache to be owned by root." 2014-08-28 23:17:06 +00:00
Elliott Hughes
d5f230af07 Merge "Remove descriptions of unimplemented triggers." 2014-08-28 16:48:14 +00:00
Trevor Drake
d4a497714a Remove descriptions of unimplemented triggers.
device-added, device-removed and service-exited were described but
never implemented.

Change-Id: I6fbd05a85576d18d6741fc6dd549acc9132b0531
2014-08-28 15:38:52 +01:00
Alex Light
3878ebd724 Change /dalvik-cache to be owned by root.
Bug: 16875245

Change-Id: I29a70215a2207bc4e0db02ab751d32a68edf4b66
2014-08-27 15:42:19 -07:00
Hans Boehm
69001e0856 Merge "Remove android_... store_barriers and 64-bit atomics." 2014-08-27 21:44:30 +00:00
Hans Boehm
9959ed9530 Remove android_... store_barriers and 64-bit atomics.
These are no longer used, and we want to strongly discourage future use.
Keep the 32-bit variants while there are still uses.  All users should move
to C11 or C++11 atomics.

Change-Id: I122b541cfd29ef4a6c932647f85d0d6a9d802061
2014-08-27 14:15:09 -07:00
Elliott Hughes
31e29dbe1e Merge "Remove duplication from sendevent.c." 2014-08-26 15:54:51 +00:00
Elliott Hughes
8e947fe716 Remove duplication from sendevent.c.
Change-Id: I402e68f843e9673e1c02e4f84f4832380c0e91ac
2014-08-25 22:16:08 -07:00
Dmitriy Ivanov
ec7cc9326e Merge "Fix typo: ifndef -> ifneq" 2014-08-25 23:29:20 +00:00
Dmitriy Ivanov
85af05ae37 Fix typo: ifndef -> ifneq
Change-Id: Id71c70b6fcd2659078a19cc652fd02807372f3a0
2014-08-25 16:26:29 -07:00
Kenny Root
5a1d5a8c79 Merge "ueventd: call _exit for safety" 2014-08-25 17:05:37 +00:00
Kenny Root
17baff480a ueventd: call _exit for safety
Make sure to call _exit instead of exit to avoid triggering exit
handlers that may have existed in the parent process.

Print out a log message when forking to process firmware events fails.

Change-Id: I2436bdf85d9a8ea26b718e62023f1dac89864667
2014-08-25 10:05:08 -07:00
Elliott Hughes
3cebf9f8c3 Merge "Add BSD false(1) and true(1)." 2014-08-24 02:54:32 +00:00
Elliott Hughes
50221f5837 Add BSD false(1) and true(1).
Bug: 17000769
Change-Id: I6b218b4c2ba3f57d344f60af7a25c45f07091d64
2014-08-22 20:26:23 -07:00
Calin Juravle
e0677ccf99 Merge "NativeBridge: Tighten security on libnativebridge" 2014-08-22 11:31:06 +00:00
Andreas Gampe
049249ce7a NativeBridge: Tighten security on libnativebridge
Do not allow arbitrary paths for the native bridge - only allow
simple names.

Do not allow re-setup of the native bridge.

Bug: 16404669

(cherry picked from commit cd2ef4c1af)

Change-Id: Ie22de356d2307fe2758f9094a85d44e61a4098a1
2014-08-22 01:44:06 -07:00
Elliott Hughes
a59b6ac697 Merge "Only the Mac doesn't have open_memstream." 2014-08-21 00:11:41 +00:00
Elliott Hughes
3ff8888f66 Only the Mac doesn't have open_memstream.
We should probably move this into art, since they're the only people using it.

Bug: 17164505
Change-Id: I67b8f0cbad4c6368d4424e6979d6b044dd36aa37
2014-08-20 16:16:24 -07:00
Elliott Hughes
373c77583f Merge "There's no non-SMP LP64." 2014-08-20 12:21:52 +00:00