Commit graph

12476 commits

Author SHA1 Message Date
Dan Albert
38b09833fe am 97179d4a: am a5e9639c: Merge "Update string Split API."
* commit '97179d4a28a627a57608e7504dcc75ee82e24c8a':
  Update string Split API.
2015-03-23 18:09:41 +00:00
Dan Albert
97179d4a28 am a5e9639c: Merge "Update string Split API."
* commit 'a5e9639cf94aad0ed88ccd1c08d43f5084432f74':
  Update string Split API.
2015-03-23 18:02:44 +00:00
Dan Albert
a5e9639cf9 Merge "Update string Split API." 2015-03-23 17:57:30 +00:00
Dan Albert
47328c96d9 Update string Split API.
Return a new vector rather than appending to the parameter.

Delimiters are also a string rather than a character. Split on any
character in the string.

Change-Id: I039b332ace5578590df9e7ca0e8fa3db28db30a3
2015-03-23 10:23:11 -07:00
Elliott Hughes
614e1f60f3 am 585f1fd9: am 201ed62c: Merge "Add a CleanSpec for grep/toolbox."
* commit '585f1fd96f1f38772b09abcb63fa605bcb2c7b4c':
  Add a CleanSpec for grep/toolbox.
2015-03-23 17:00:46 +00:00
Elliott Hughes
585f1fd96f am 201ed62c: Merge "Add a CleanSpec for grep/toolbox."
* commit '201ed62c4f2f9be7632afb71aef9df6df5877617':
  Add a CleanSpec for grep/toolbox.
2015-03-23 16:55:27 +00:00
Elliott Hughes
201ed62c4f Merge "Add a CleanSpec for grep/toolbox." 2015-03-23 16:51:49 +00:00
Elliott Hughes
1df7736e80 am 285be566: am 0ffd90d2: Merge "Add missing parenthesis in init log message."
* commit '285be5661ef415b66cf124c4454706235405e8bc':
  Add missing parenthesis in init log message.
2015-03-23 15:24:48 +00:00
Elliott Hughes
285be5661e am 0ffd90d2: Merge "Add missing parenthesis in init log message."
* commit '0ffd90d26ba5d1451e7e58cb7f62420a54701ede':
  Add missing parenthesis in init log message.
2015-03-23 15:18:33 +00:00
Elliott Hughes
0ffd90d26b Merge "Add missing parenthesis in init log message." 2015-03-23 15:13:45 +00:00
Elliott Hughes
930974cedf Add missing parenthesis in init log message.
Change-Id: Iddcd8a002bfc692b1e70d59fa8c6530306c500fa
2015-03-23 08:07:19 -07:00
Narayan Kamath
fb50475b71 am a3d3144d: am fd26252d: Merge "Remove libzipfile."
* commit 'a3d3144def1eeb25d8086843d3a42ad45d807e80':
  Remove libzipfile.
2015-03-23 11:01:45 +00:00
Narayan Kamath
a3d3144def am fd26252d: Merge "Remove libzipfile."
* commit 'fd26252da2d736236bb1d80fc2e809421f9ffa4d':
  Remove libzipfile.
2015-03-23 10:55:33 +00:00
Narayan Kamath
fd26252da2 Merge "Remove libzipfile." 2015-03-23 10:49:07 +00:00
Elliott Hughes
94fa67e980 Add a CleanSpec for grep/toolbox.
I moved grep out of toolbox a couple of months ago, so hopefully no one
else should see this. Just in case, though, remove grep and toolbox so
they both get rebuilt and any symbolic links will find themselves pointing
to the right binary.

Bug: 19878755
Change-Id: I15f63500cae3578a82a895f851c797fd324bbe02
2015-03-22 18:04:54 -07:00
Sami Tolvanen
77a6f08335 am db1c191c: am 1d792dd4: Merge "Fix the number of arguments for verity commands"
* commit 'db1c191cb1f4a98a04ae9a894fab2c53a1e45d60':
  Fix the number of arguments for verity commands
2015-03-22 18:13:08 +00:00
Sami Tolvanen
db1c191cb1 am 1d792dd4: Merge "Fix the number of arguments for verity commands"
* commit '1d792dd4161728240e23f21aceaff74070b24c7e':
  Fix the number of arguments for verity commands
2015-03-22 18:06:39 +00:00
Sami Tolvanen
1d792dd416 Merge "Fix the number of arguments for verity commands" 2015-03-22 18:01:13 +00:00
Sami Tolvanen
8d6ea4bed4 Fix the number of arguments for verity commands
Neither of the built-in verity state commands accept arguments, so
set the number of required arguments to zero.

Change-Id: Id57fe671b6b82eaf1e43b8ed7ff9d1e502ada5bd
2015-03-22 12:41:46 +00:00
Elliott Hughes
8f987fcb34 am b15ef843: am d69a1c50: Merge "Always use strerror to report errno."
* commit 'b15ef843e5ff929a902f2da21dba0b3eb088ff2e':
  Always use strerror to report errno.
2015-03-21 17:11:29 +00:00
Elliott Hughes
5d0dfd2a81 am f58856b6: am bf684148: Merge "Ensure all init commands are documented."
* commit 'f58856b64994f04966adec62d5fcf0a71191ad91':
  Ensure all init commands are documented.
2015-03-21 17:11:27 +00:00
Daniel Rosenberg
0d2360532d am 6498ed38: am 72510c56: Merge "init: refactor firmware loading locations into table"
* commit '6498ed382eb4b70688bffac734dd99259904b96d':
  init: refactor firmware loading locations into table
2015-03-21 17:11:26 +00:00
Elliott Hughes
953e666780 am fc0d7812: am d5de25f8: Merge "Use unique_ptr to call closedir."
* commit 'fc0d7812f974c937c6e4488745d46560e9d2dec6':
  Use unique_ptr to call closedir.
2015-03-21 17:11:25 +00:00
Elliott Hughes
b15ef843e5 am d69a1c50: Merge "Always use strerror to report errno."
* commit 'd69a1c502e11d3be052d9c0bb20f0c7762428925':
  Always use strerror to report errno.
2015-03-21 16:17:13 +00:00
Elliott Hughes
f58856b649 am bf684148: Merge "Ensure all init commands are documented."
* commit 'bf684148e2f8182079b9483e7ead30d9b93cd020':
  Ensure all init commands are documented.
2015-03-21 16:17:11 +00:00
Daniel Rosenberg
6498ed382e am 72510c56: Merge "init: refactor firmware loading locations into table"
* commit '72510c56ecd953c81ca4222ac0982f51c9eb7c46':
  init: refactor firmware loading locations into table
2015-03-21 16:17:10 +00:00
Elliott Hughes
fc0d7812f9 am d5de25f8: Merge "Use unique_ptr to call closedir."
* commit 'd5de25f819c0f8e2589d786571bface3409e13ff':
  Use unique_ptr to call closedir.
2015-03-21 16:17:09 +00:00
Elliott Hughes
d69a1c502e Merge "Always use strerror to report errno." 2015-03-21 00:11:18 +00:00
Elliott Hughes
cd67f00e18 Always use strerror to report errno.
Change-Id: Icd18e4bd7dc093c18967f45b99cd451359457b03
2015-03-20 17:05:56 -07:00
Elliott Hughes
bf684148e2 Merge "Ensure all init commands are documented." 2015-03-21 00:01:27 +00:00
Elliott Hughes
91a3be547c Ensure all init commands are documented.
Change-Id: I21ef4d88b33337093396e14d792e1ff1fe0bfa17
2015-03-20 16:59:59 -07:00
Daniel Rosenberg
72510c56ec Merge "init: refactor firmware loading locations into table" 2015-03-20 23:55:30 +00:00
Elliott Hughes
d5de25f819 Merge "Use unique_ptr to call closedir." 2015-03-20 23:17:57 +00:00
Elliott Hughes
81399e1e0e Use unique_ptr to call closedir.
Change-Id: I8f572a06ce59283e5bd444ae0491dea71b0ea304
2015-03-20 16:03:41 -07:00
Daniel Rosenberg
d1d9602f89 init: refactor firmware loading locations into table
Change-Id: I3ce8f9d237bf783335ae85540306aa539a8da568
Signed-off-by: Daniel Rosenberg <drosen@google.com>
2015-03-20 15:42:01 -07:00
Dan Albert
bcfaf8cde9 am 34c7ab56: am db7a994e: Merge "Add google3 style logging to libbase."
* commit '34c7ab5693b473cbbffa8fb4fb133afd66c0dd54':
  Add google3 style logging to libbase.
2015-03-20 21:20:40 +00:00
Dan Albert
34c7ab5693 am db7a994e: Merge "Add google3 style logging to libbase."
* commit 'db7a994e1687574a675ccf5d56aa76df4cd98a88':
  Add google3 style logging to libbase.
2015-03-20 21:12:42 +00:00
Dan Albert
db7a994e16 Merge "Add google3 style logging to libbase." 2015-03-20 21:06:52 +00:00
Dan Albert
58310b49fc Add google3 style logging to libbase.
ART already had a flavor of this, but it was specialized for their use
case a bit.

Note that the logging.* tests are currently disabled for the device
because there is no good way to capture the output of liblog. We can
make something that will execute logcat and then then scan the output,
but that's messy. Since we know it at least works on the host, we can
add better device tests later.

Change-Id: I47acd87a3312c0a5285b03f9c8dadef0c669f06a
2015-03-20 14:04:35 -07:00
Mark Salyzyn
140b67e71c am bee0f24b: am 48a5288e: Merge "logd: statistics: missing comma"
* commit 'bee0f24b45fe1363e20e21165a7b990d74490d8b':
  logd: statistics: missing comma
2015-03-20 21:00:49 +00:00
Mark Salyzyn
bee0f24b45 am 48a5288e: Merge "logd: statistics: missing comma"
* commit '48a5288ed3bf527e68dbefc9884f3a713ef632a2':
  logd: statistics: missing comma
2015-03-20 20:54:18 +00:00
Mark Salyzyn
48a5288ed3 Merge "logd: statistics: missing comma" 2015-03-20 20:47:27 +00:00
Mark Salyzyn
317843decf logd: statistics: missing comma
regression from statistics rewrite series resulted in build breakage

Change-Id: I71b532b23437b9b5f3af47b18c9110f3d7dda48a
2015-03-20 13:46:00 -07:00
Elliott Hughes
833c7ee68a am a575b850: am 61af6530: Merge "Remove /dev/alarm cruft from uptime."
* commit 'a575b8503d3d88bdd10037744ff902e2db499e0a':
  Remove /dev/alarm cruft from uptime.
2015-03-20 20:44:50 +00:00
Elliott Hughes
a575b8503d am 61af6530: Merge "Remove /dev/alarm cruft from uptime."
* commit '61af6530605e10ca99f066c851436921c0385479':
  Remove /dev/alarm cruft from uptime.
2015-03-20 20:38:37 +00:00
Mark Salyzyn
4983e7960d am 833b582d: am bbb1fab7: Merge "logd: optimize statistics"
* commit '833b582d0ddc3d022716dc2311f2444f2876d27b':
  logd: optimize statistics
2015-03-20 20:37:21 +00:00
Elliott Hughes
61af653060 Merge "Remove /dev/alarm cruft from uptime." 2015-03-20 20:32:42 +00:00
Dan Albert
ba1556f1d0 am 301fb4d6: am ca2b67e1: Merge "Additional cleanup of start_device_log."
* commit '301fb4d6c9502ff3bbecf64277862dfd69dec153':
  Additional cleanup of start_device_log.
2015-03-20 20:31:07 +00:00
Mark Salyzyn
833b582d0d am bbb1fab7: Merge "logd: optimize statistics"
* commit 'bbb1fab76d9416a12c6336a2e32b709dc88adc6d':
  logd: optimize statistics
2015-03-20 20:30:42 +00:00
Mark Salyzyn
bbb1fab76d Merge "logd: optimize statistics" 2015-03-20 20:26:42 +00:00