Paul Lawrence
a7c02b7ee6
Merge "Adding e4crypt support"
2015-03-26 14:16:25 +00:00
Richard Uhler
b823d01730
am bf948fb0: am f30beae1: am a0115bf7: Merge "Add make target for shared libcutils on host."
...
* commit 'bf948fb022ddc2ba8e7a18e61c9102e4b0a94105':
Add make target for shared libcutils on host.
2015-03-25 16:52:34 +00:00
Richard Uhler
bf948fb022
am f30beae1: am a0115bf7: Merge "Add make target for shared libcutils on host."
...
* commit 'f30beae169c89aa945496c43131432609c41b0b5':
Add make target for shared libcutils on host.
2015-03-25 16:18:52 +00:00
Richard Uhler
f30beae169
am a0115bf7: Merge "Add make target for shared libcutils on host."
...
* commit 'a0115bf78db6ef373754fade0fe4028ac8c88653':
Add make target for shared libcutils on host.
2015-03-25 15:53:35 +00:00
Richard Uhler
a0115bf78d
Merge "Add make target for shared libcutils on host."
2015-03-25 15:48:42 +00:00
Jean-Michel Trivi
187f67695a
Merge "Fix comment in audio definitions header"
2015-03-25 01:14:54 +00:00
Jean-Michel Trivi
1ede5537a3
Fix comment in audio definitions header
...
Change-Id: I08f23f3feaacf4cb39e93992fe839f1c1f084363
2015-03-24 17:17:45 -07:00
Richard Uhler
acb31ba905
Add make target for shared libcutils on host.
...
Needed by host dex2oat.
Change-Id: Ia5b53136de3d531c820f03c3f251e58418204be1
2015-03-24 14:46:01 -07:00
Jeff Sharkey
6b5a6384a1
Merge "Fix bug blocking access to secondary users."
2015-03-24 20:31:08 +00:00
Jeff Sharkey
6c161fa7d8
Fix bug blocking access to secondary users.
...
Change-Id: I97ce510b6bc705488b9bea3340a72fb5449f8134
2015-03-24 11:53:10 -07:00
Mark Salyzyn
352b108c10
am 9abef8e3: am 1394033a: am 8257211f: Merge "init: missing break statement"
...
* commit '9abef8e3a226ba77edfbdf227f4799591befd220':
init: missing break statement
2015-03-24 17:10:00 +00:00
Mark Salyzyn
9abef8e3a2
am 1394033a: am 8257211f: Merge "init: missing break statement"
...
* commit '1394033a6bcd52af2471eb504b980bf390157b5a':
init: missing break statement
2015-03-24 16:55:18 +00:00
Mark Salyzyn
1394033a6b
am 8257211f: Merge "init: missing break statement"
...
* commit '8257211f9e696ebf7ca13f513f7e44431616313c':
init: missing break statement
2015-03-24 16:48:48 +00:00
Mark Salyzyn
8257211f9e
Merge "init: missing break statement"
2015-03-24 16:44:05 +00:00
Mark Salyzyn
7a3d66c9eb
init: missing break statement
...
Change-Id: Iac4a19c404590c3faba6021c7e537b01805c2d45
2015-03-24 07:29:22 -07:00
Christopher Ferris
ad27dd98ae
am bdabcf4c: am 730d7c53: am 8e1697e7: Merge "Fix mac sdk build."
...
* commit 'bdabcf4c8bd7c9b5b29e2d3af07a5fb0e2733823':
Fix mac sdk build.
2015-03-24 05:20:50 +00:00
Christopher Ferris
bdabcf4c8b
am 730d7c53: am 8e1697e7: Merge "Fix mac sdk build."
...
* commit '730d7c530a4e0d8fc0a2c21f024288b4acacf3b9':
Fix mac sdk build.
2015-03-24 05:07:19 +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
0f5bf14d03
am ebc514b8: am 9d37a6af: am 9c5a5b3c: Merge "Lose runcon to toybox."
...
* commit 'ebc514b8a22b9d6ce301d5878687083c4308e797':
Lose runcon to toybox.
2015-03-24 03:25:44 +00:00
Dan Albert
b3cfad4e90
am ce21c1c5: am ee022be9: am c31de501: Merge "More Mac fix."
...
* commit 'ce21c1c57355a0bf95695792f3430ced1cca5d75':
More Mac fix.
2015-03-24 03:25:23 +00:00
Dan Albert
f098148d8e
am b4c5b8f8: am 45200485: am 89996c4b: Merge "Undo mac fix to fix windows, fix mac differently."
...
* commit 'b4c5b8f8ede4ea5b1886c5457daa5d45a250e2a6':
Undo mac fix to fix windows, fix mac differently.
2015-03-24 03:25:19 +00:00
Mark Salyzyn
f9429983c8
am e235375e: am 229f332f: am ddccd24f: Merge "liblog: remove internal __write_to_log_null"
...
* commit 'e235375e3347157feb7cb9d6185efa8dfc78f408':
liblog: remove internal __write_to_log_null
2015-03-24 03:25:11 +00:00
Jeff Sharkey
a5af90d9d9
Merge "Fix build, missed refactoring."
2015-03-24 03:07:58 +00:00
Jeff Sharkey
05edf7a5a9
Fix build, missed refactoring.
...
Change-Id: I17337133d8ca6a421e12c0834f42655f1a10197e
2015-03-23 20:05:32 -07:00
Dan Albert
33602c2cd1
am 497b044e: am 9b2aba07: am ec574408: Merge "(Probably) fix the mac build."
...
* commit '497b044e4bbb986cb612c3336e37ecbe472ca08e':
(Probably) fix the mac build.
2015-03-24 02:59:29 +00:00
Greg Hackmann
9800fa79ab
am 7754367c: am 91080a42: am 2de01f5a: Merge "libziparchive: fix extraction of >2GiB images"
...
* commit '7754367c4d194337b6df1b87a3ce94e4103b0b74':
libziparchive: fix extraction of >2GiB images
2015-03-24 02:59:25 +00:00
Dan Albert
b3edb9d3a1
am 49da340d: am 4a342186: am 9f8093f8: Merge "Move gettid() into libcutils."
...
* commit '49da340d9ee272ff561b95288e4390d606b22ea9':
Move gettid() into libcutils.
2015-03-24 02:59:21 +00:00
Dan Albert
b159f4a82a
am 38b09833: am 97179d4a: am a5e9639c: Merge "Update string Split API."
...
* commit '38b09833fe7ec3ffe70a0fc2bd3d0dc66ec7572d':
Update string Split API.
2015-03-24 02:57:39 +00:00
Elliott Hughes
718c05ee6a
am 614e1f60: am 585f1fd9: am 201ed62c: Merge "Add a CleanSpec for grep/toolbox."
...
* commit '614e1f60f33f555769d06d6b47ef1bd93fc7d81c':
Add a CleanSpec for grep/toolbox.
2015-03-24 02:57:08 +00:00
Jeff Sharkey
a140afe454
Add multi-user GIDs to SD card daemon.
...
This will eventually allow us to have a single unified filesystem
instead of requiring zygote to use bind mounts.
Change-Id: I1fc4ada4874698a00e7e0b8800617732e69348f0
2015-03-23 19:25:27 -07:00
Elliott Hughes
ebc514b8a2
am 9d37a6af: am 9c5a5b3c: Merge "Lose runcon to toybox."
...
* commit '9d37a6af31e9717b759cd59ebf74f017eb1a13da':
Lose runcon to toybox.
2015-03-24 01:36:46 +00:00
Elliott Hughes
d46335ce6c
am 1df7736e: am 285be566: am 0ffd90d2: Merge "Add missing parenthesis in init log message."
...
* commit '1df7736e80fb5165f0cb77cbfca81889872e0864':
Add missing parenthesis in init log message.
2015-03-24 01:33:52 +00:00
Narayan Kamath
7d1c434e1f
am fb50475b: am a3d3144d: am fd26252d: Merge "Remove libzipfile."
...
* commit 'fb50475b71c34f6dce011d80d704aac99cf6c8ae':
Remove libzipfile.
2015-03-24 01:31:47 +00: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
Sami Tolvanen
49e8de2e92
am 77a6f083: am db1c191c: am 1d792dd4: Merge "Fix the number of arguments for verity commands"
...
* commit '77a6f08335f260409ceaa0c64a1dfad60c3aa2d2':
Fix the number of arguments for verity commands
2015-03-24 01:30:27 +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
ce21c1c573
am ee022be9: am c31de501: Merge "More Mac fix."
...
* commit 'ee022be9f8ab7614efaba9f393f6eb42f92fe43b':
More Mac fix.
2015-03-23 23:51:39 +00: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
Elliott Hughes
e3973841e8
am 8f987fcb: am b15ef843: am d69a1c50: Merge "Always use strerror to report errno."
...
* commit '8f987fcb34f61f9f52d8ef556f82a1e16ae67be9':
Always use strerror to report errno.
2015-03-23 23:24:27 +00:00
Elliott Hughes
ed2eba19b4
am 5d0dfd2a: am f58856b6: am bf684148: Merge "Ensure all init commands are documented."
...
* commit '5d0dfd2a811b58428a5bb1cbce1df01257bb8387':
Ensure all init commands are documented.
2015-03-23 23:24:25 +00:00
Daniel Rosenberg
03854069a0
am 0d236053: am 6498ed38: am 72510c56: Merge "init: refactor firmware loading locations into table"
...
* commit '0d2360532de081bc97099690d4b16effe99d1e01':
init: refactor firmware loading locations into table
2015-03-23 23:24:24 +00:00
Elliott Hughes
259ce7cfa0
am 953e6667: am fc0d7812: am d5de25f8: Merge "Use unique_ptr to call closedir."
...
* commit '953e6667808d59ada8e6111fa8481870b1f2efb9':
Use unique_ptr to call closedir.
2015-03-23 23:24:22 +00:00
Dan Albert
b4c5b8f8ed
am 45200485: am 89996c4b: Merge "Undo mac fix to fix windows, fix mac differently."
...
* commit '4520048535a980203125d830db3bba61222ac324':
Undo mac fix to fix windows, fix mac differently.
2015-03-23 23:22:49 +00: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