Commit Graph

12548 Commits

Author SHA1 Message Date
Sami Tolvanen 946a0f3e19 Use structured format for verity metadata
Specify the location of verity metadata in fstab, and use a
type-length-value format for the metadata that allows other
data to be stored in the same location in an extensible way.

Change-Id: Id8711f7d51dc1e4e9a4d84f9951240f64528e69d
2015-03-24 09:02:47 +00:00
Christopher Ferris 730d7c530a am 8e1697e7: Merge "Fix mac sdk build."
* commit '8e1697e7528f88985a5d702af53ef5d446f65fa1':
  Fix mac sdk build.
2015-03-24 05:00:51 +00:00
Christopher Ferris 8e1697e752 Merge "Fix mac sdk build." 2015-03-24 04:55:37 +00:00
Christopher Ferris fc3576f675 Fix mac sdk build.
Add include files for types and functions that were not included properly.

Change-Id: I4849f5bdf535c6eec9254228cf980c30d11a5a1b
2015-03-23 21:40:30 -07:00
Elliott Hughes 9d37a6af31 am 9c5a5b3c: Merge "Lose runcon to toybox."
* commit '9c5a5b3c2bb25de486135eee4c61bd7695a80d2d':
  Lose runcon to toybox.
2015-03-24 01:30:32 +00:00
Elliott Hughes 9c5a5b3c2b Merge "Lose runcon to toybox." 2015-03-24 01:23:36 +00:00
Elliott Hughes addb229c72 Lose runcon to toybox.
Change-Id: I0fa4a1907a9def4ba7dc1348f57299cd578fdf87
2015-03-23 17:55:23 -07:00
Dan Albert ee022be9f8 am c31de501: Merge "More Mac fix."
* commit 'c31de5011a2b73af04d9e85dca863352458104ca':
  More Mac fix.
2015-03-23 23:45:53 +00:00
Dan Albert c31de5011a Merge "More Mac fix." 2015-03-23 23:39:33 +00:00
Dan Albert 483060208c More Mac fix.
Change-Id: I7a1f726819c68eea1afb7e45f92954325f8933e1
2015-03-23 16:38:46 -07:00
Dan Albert 4520048535 am 89996c4b: Merge "Undo mac fix to fix windows, fix mac differently."
* commit '89996c4b74c438bd426710ff52139893aa39514c':
  Undo mac fix to fix windows, fix mac differently.
2015-03-23 23:18:41 +00:00
Dan Albert 89996c4b74 Merge "Undo mac fix to fix windows, fix mac differently." 2015-03-23 23:13:00 +00:00
Dan Albert e308104390 Undo mac fix to fix windows, fix mac differently.
Change-Id: I7d1ee439d25e17c31c0be448e67a90a0f626ff42
2015-03-23 16:07:42 -07:00
Mark Salyzyn 229f332f45 am ddccd24f: Merge "liblog: remove internal __write_to_log_null"
* commit 'ddccd24f446797cfc3455f309d55c54183b64b53':
  liblog: remove internal __write_to_log_null
2015-03-23 22:46:38 +00:00
Mark Salyzyn ddccd24f44 Merge "liblog: remove internal __write_to_log_null" 2015-03-23 22:43:04 +00:00
Mark Salyzyn 0d00a44a8b liblog: remove internal __write_to_log_null
__write_to_log_null never retries initialization and only
made sense for the kernel logger. The user space logger
can come and go.

Bug: 19732485
Change-Id: Iac34ea1c52ec82db4ee0c2c73ba0950ace4d4dec
2015-03-23 22:07:29 +00:00
Dan Albert 9b2aba0733 am ec574408: Merge "(Probably) fix the mac build."
* commit 'ec57440878476149468a014bd41acef27ceb8789':
  (Probably) fix the mac build.
2015-03-23 21:55:49 +00:00
Dan Albert ec57440878 Merge "(Probably) fix the mac build." 2015-03-23 21:49:06 +00:00
Dan Albert 728b13f08d (Probably) fix the mac build.
Change-Id: I4209f2d66d8701df2f32dcfb79abea9ea6d3dc69
2015-03-23 14:48:05 -07:00
Greg Hackmann 91080a4296 am 2de01f5a: Merge "libziparchive: fix extraction of >2GiB images"
* commit '2de01f5a99f916c36124c6bc8cb0d6f18df03496':
  libziparchive: fix extraction of >2GiB images
2015-03-23 21:45:34 +00:00
Greg Hackmann 2de01f5a99 Merge "libziparchive: fix extraction of >2GiB images" 2015-03-23 21:42:15 +00:00
Greg Hackmann 503cd6d437 libziparchive: fix extraction of >2GiB images
Bug: 19888174

Change-Id: I33a577909ced522d46223e2182e0bb18c291af27
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2015-03-23 14:30:40 -07:00
Dan Albert 4a3421862e am 9f8093f8: Merge "Move gettid() into libcutils."
* commit '9f8093f88850304fd225ae612c3df960d1d247fc':
  Move gettid() into libcutils.
2015-03-23 21:19:42 +00:00
Dan Albert 9f8093f888 Merge "Move gettid() into libcutils." 2015-03-23 21:13:37 +00:00
Dan Albert 7dfb61dcdc Move gettid() into libcutils.
Change-Id: Ic8a15036833e6d129b7998d954b804be391de399
2015-03-23 13:01:21 -07: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 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 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 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 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 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