Commit graph

20120 commits

Author SHA1 Message Date
David Benjamin
2257f6baf5 Fix include-what-you-use problem in android-pubkey.c.
This fixes a problem building against BoringSSL master.

Change-Id: Ib052c6a59454126a83e32e9a43391470aca7356a
2016-04-15 17:44:05 -04:00
James Hawkins
1607ea64cb Merge "bootstat: Calculate and log the time_since_last_boot metric." 2016-04-15 16:46:52 +00:00
James Hawkins
2d8b3e66c6 bootstat: Calculate and log the time_since_last_boot metric.
Bug: 28163811
Change-Id: I2e1350531f6a0fc891c270cfdfca6c8ad63f8040
2016-04-15 08:44:01 -07:00
Yabin Cui
f20e4b1b71 Merge "libbacktrace: only build libbacktrace_offline static library." 2016-04-14 21:14:55 +00:00
Yabin Cui
51e607056d libbacktrace: only build libbacktrace_offline static library.
As device may not have libbacktrace_offline shared library, simpleperf
no longer rely on it. So there is no reason to keep libbacktrace_offline
shared library.

Bug: 28152982
Change-Id: If8e31b1434646dbbfed60264eb25f034bc5d6946
2016-04-14 10:31:08 -07:00
Treehugger Robot
9a3e238a60 Merge "logd: switch from android_ids to getpwuid" 2016-04-14 16:06:08 +00:00
Elliott Hughes
d93e7cacef Merge "Remove libmincrypt." 2016-04-14 15:19:06 +00:00
Mark Salyzyn
b8a95bd3c9 logd: switch from android_ids to getpwuid
Bug: 27999086
Change-Id: I7f4e68b21f58789b4dcada04f9c27f5722940c02
2016-04-14 15:14:46 +00:00
Daniel Rosenberg
e99283103b Merge "Add nofail fstab option" 2016-04-14 00:12:44 +00:00
Mark Salyzyn
df7c1ed3a0 Merge changes I7ebb6146,I0b42736c,I5331acde
* changes:
  logcat: expand -n, -r and -b
  logcat: allow comma-separate list of buffers
  logcat: Adjust help to make it more meaningful
2016-04-13 21:32:48 +00:00
Treehugger Robot
3e0eaa4103 Merge changes Ibc8038b1,I1876ecd7,I57d70f8b
* changes:
  adb: after `adb root`, wait for the device in any state.
  adb: add support for 'wait-for-any'.
  adb: make 'wait-for-{recovery,sideload,bootloader} work.
2016-04-13 20:25:53 +00:00
Josh Gao
48a348183f adb: after adb root, wait for the device in any state.
Otherwise, `adb root` while the device is in recovery will hang.

Bug: http://b/28168212
Change-Id: Ibc8038b1745139fb505e466c74c605b9df474c8c
2016-04-13 12:28:04 -07:00
Josh Gao
86441c31fe adb: add support for 'wait-for-any'.
Allow waiting for a device in any state.

Bug: http://b/28168212
Change-Id: I1876ecd70089ca88f2da5de4182e13724ec50501
2016-04-13 12:28:04 -07:00
Josh Gao
08881e72f4 adb: make 'wait-for-{recovery,sideload,bootloader} work.
The help for wait-for-* documents this as working, but we only had a
special case for 'wait-for-device'. Make the others work as well.

Bug: http://b/28170823
Change-Id: I57d70f8b9a383947c4f761919bfbd8515a013520
2016-04-13 12:28:04 -07:00
Mark Salyzyn
33c262513f logcat: expand -n, -r and -b
- Add property expansion to the -n/--rotate-count,
  -r/--rotate-kbytes and -b/--buffer parameters.
  e.g. -r '${logcat.rotate-count:-6}' will expand the property
  logcat.rotate-count, and if not present will default to 6
- Add gtest to confirm mid-stream expansion
- No longer support ",:;<whitespace>" for buffer tokenization,
  settling on only supporting ",".

Bug: 28120456
Change-Id: I7ebb6146f72047631536c457952fa50d0abb98ab
2016-04-13 11:43:03 -07:00
Mark Salyzyn
4517773296 logcat: allow comma-separate list of buffers
- Add parsing to support comma+ separated list of buffers.
- Move get_size test into a standalone get_groups function
- add some additional tests for this feature, leveraging
  get_groups to confirm buffer selection.

Bug: 28120456
Change-Id: I0b42736c08cf4b2a435cb74cda540dc163a26bd1
2016-04-13 11:42:57 -07:00
Mark Salyzyn
378f4745a2 logcat: Adjust help to make it more meaningful
It is not clear about the long option aliases, list
them comma separate first for clarity. Squash lines
of help content if possible. Lock to 3 indents, one
for options, another for text on same line as options
and another for next line or continuation.

Bug: 28120456
Change-Id: I5331acde3ac0fd3b87f6699ba108f6cef46a1563
2016-04-13 11:42:52 -07:00
Treehugger Robot
4888d79a94 Merge "Remove undocumented functionality from init." 2016-04-13 15:43:03 +00:00
Elliott Hughes
bdeac39a42 Remove undocumented functionality from init.
(cherry-pick of a3cc6026301db08285028c760af2665a66b3cc44.)

Bug: http://b/28151340
Change-Id: I5360502c79d9113a13055bf017b39c099033e947
2016-04-13 07:56:51 -07:00
Elliott Hughes
6b11c13aed Remove libmincrypt.
Bug: http://b/27287913
Change-Id: Ie85a7d8fecc3577a16c0a79d5f95379ec3ecc15b
2016-04-12 16:20:23 -07:00
Elliott Hughes
52eb93ca57 Merge changes from topic 'boringssl_conversion'
* changes:
  Switch fs_mgr and adb to libcrypto_utils.
  Add libcrypto_utils.
2016-04-12 23:12:35 +00:00
Treehugger Robot
90c2e75db9 Merge "logcat: apct test failures" 2016-04-12 23:11:56 +00:00
Mattias Nissler
097b6bbc76 Switch fs_mgr and adb to libcrypto_utils.
Update code and dependencies to use BoringSSL + libcrypto_utils
instead of mincrypt.

Change-Id: Ic75164bd50c84b81b6310e27a67d4b3c174984f9
2016-04-12 23:04:11 +00:00
Mark Salyzyn
3842b1a5f6 logcat: apct test failures
Bug: 27241615
Change-Id: I100a5071c059fe9fa85bbdc33db552b16d7bdf60
2016-04-12 22:36:04 +00:00
Mattias Nissler
b62146dcab Add libcrypto_utils.
This provides a tiny library implementing encode/decode functionality
for Android's custom RSA public key binary format. Keys are encoded
from and decoded to BoringSSL RSA key objects.

Change-Id: I55e5522d557e0e9f35927a87b6581f020ee34e7a
2016-04-12 15:08:01 -07:00
Treehugger Robot
979ce0e338 Merge "binderwrapper: Resolve ambiguous base::Closure reference" 2016-04-12 21:48:45 +00:00
Daniel Rosenberg
de551ffee9 Add nofail fstab option
This option allows fs_mgr to ignore mount errors on an optional
partition to allow booting to continue.

Bug: 28071890
Change-Id: I71a2b3c1c573297cab18884b4c4bd7c27ced2901
2016-04-12 14:06:25 -07:00
Treehugger Robot
911982d8b5 Merge "healthd: Explicitly reference headers from libbinder" 2016-04-12 20:55:32 +00:00
Christopher Wiley
09910f4baa binderwrapper: Resolve ambiguous base::Closure reference
Disambiguate between base and android::base namespaces.  This matters
when headers from libbase are indirectly included.

Bug: 27804373
Test: Compiles in that referenced situation.

Change-Id: Icb26595bb0013733aa8c03971c9f4a950c8b2ab1
2016-04-12 13:19:29 -07:00
Christopher Wiley
22399089ef healthd: Explicitly reference headers from libbinder
When creating static libs with healthd logic, explicitly
reference libbinder to pick up its header include paths.

Bug: 27804373
Test: healthd libs compile when libbinder's header include
      paths change.

Change-Id: I1014eb0b73d06815c42a527c4ea7e63c35ca3530
2016-04-12 13:07:18 -07:00
Elliott Hughes
5aef89b3a3 Merge "Fix toolbox failure return to match similar tools." 2016-04-12 18:32:58 +00:00
Elliott Hughes
22b3567e88 Fix toolbox failure return to match similar tools.
Bug: https://code.google.com/p/android/issues/detail?id=182226
Change-Id: Ib05709b8f9b474d5989b69abd949a6dc661af998
2016-04-12 08:40:43 -07:00
Elliott Hughes
2d7c1cd96a Merge "Clean up toolbox runner slightly." 2016-04-12 15:16:57 +00:00
Elliott Hughes
ad2c07e4b5 Clean up toolbox runner slightly.
Remove the weird @command syntax, and make toolbox itself list the available
commands, like toybox does. Also stop special-casing toolbox itself.

Change-Id: I77dfaaf0cf42e375d866b77362dd8afa717fb2e1
2016-04-11 17:45:49 -07:00
Dimitry Ivanov
dc727ef1f0 Merge "Allow vendors to extend the list of public libs" 2016-04-11 20:03:16 +00:00
James Hawkins
a5fef89814 Merge "bootstat: Differentiate system update boot times." 2016-04-11 17:03:43 +00:00
Mark Salyzyn
f7040c8dee Merge "liblog: remove android_ids and replace with getpwuid" 2016-04-11 15:48:46 +00:00
William Roberts
8a5b9caaa6 liblog: remove android_ids and replace with getpwuid
Note: This code makes the assumption that getpwuid is
thread safe, which it is ONLY ON BIONIC. Thus,
if you attempt to use this on a non-target build, you
may get burned. Thus, an ifndef checking on __BIONIC__
is used to produce a build error if you attempt to do
so.

Change-Id: I61038c428b71771edcfc76f18d8fc5cbe349238b
Bug: 27999086
Signed-off-by: William Roberts <william.c.roberts@intel.com>
2016-04-11 14:55:56 +00:00
Elliott Hughes
af61acc292 Merge "Remove debugging code for a fixed 3.6 kernel bug." 2016-04-09 00:25:17 +00:00
James Hawkins
b9cf77159a bootstat: Differentiate system update boot times.
Bug: 27454343
Change-Id: Idb2e6f55ad7dda546a486954201619bb73cee6b0
2016-04-08 15:32:19 -07:00
Alex Vakulenko
a10b4a0235 Merge "metricsd: Remove release/aquire semantic from scoped_ptr/unique_ptr" 2016-04-08 18:03:00 +00:00
Alex Vakulenko
7df991a21d metricsd: Remove release/aquire semantic from scoped_ptr/unique_ptr
Now that scoped_ptr is just a type alias to unique_ptr, there is no
longer a need to convert between the two by using .release() and
constructing the other with a raw pointer.

BUG: None
TEST: Built for dragonboard, all unit tests pass (except for update_engine,
      but those tests failed before these changes too).

Change-Id: Ibf0a094805d22d00ca10e1c67f68efb08c8677df
2016-04-08 09:59:05 -07:00
Elliott Hughes
2c78f62638 Merge "ueventd: convert to use pwd family of functions" 2016-04-08 01:47:42 +00:00
Elliott Hughes
1134925fb6 Merge "property_service: drop unused header" 2016-04-08 01:42:45 +00:00
Elliott Hughes
54c27c7cf6 Merge "init: drop unused header android_filesystem_config.h" 2016-04-08 01:42:29 +00:00
Elliott Hughes
171504f831 Merge "init: switch from android_ids to getpwnam" 2016-04-08 01:42:09 +00:00
William Roberts
5b5a8ace61 ueventd: convert to use pwd family of functions
Switch ueventd to use the grp.h and pwd.h family of
functions for converting strings to uids. This removes the
need for using android_filesystem_config.h.

Change-Id: I25a6f536bb11683d5cd69a0d7b348d25a272dd3b
Bug: 27999086
Signed-off-by: William Roberts <william.c.roberts@intel.com>
2016-04-07 13:38:43 -07:00
William Roberts
8e1dce8ba0 property_service: drop unused header
Remove android_filesystem_config.h since it was not being used.

Change-Id: I691513d50a3fdb7563a63aee7551137ba983825c
Bug: 27999086
Signed-off-by: William Roberts <william.c.roberts@intel.com>
2016-04-07 13:38:43 -07:00
William Roberts
6df15704bd init: drop unused header android_filesystem_config.h
Change-Id: I66e637bc2d7fd5f385f40f150becfe515c53c19a
Bug: 27999086
Signed-off-by: William Roberts <william.c.roberts@intel.com>
2016-04-07 13:38:43 -07:00
William Roberts
3792e6cf21 init: switch from android_ids to getpwnam
Start to move users of android_filesystem_config.h to use the
standard grp and pwd interface functions.

Advantages:
  * one copy of android_ids in libc, removing it from init objects.
  * immediately starts oem_xxx users and groups in rc.
  * future will support _named_ oem ids via backend improvements.

Change-Id: Ib1ae1e0cbdcaaf60deb3759681a6030b615c069c
Bug: 27999086
Signed-off-by: William Roberts <william.c.roberts@intel.com>
2016-04-07 13:38:36 -07:00