Commit Graph

8926 Commits

Author SHA1 Message Date
Ying Wang 1e6cd741fd am 803fb62b: Merge "Remove unused LOCAL_LDLIBS."
* commit '803fb62bb49b551afff546b4748d2d3e9ec54af1':
  Remove unused LOCAL_LDLIBS.
2014-05-07 22:54:26 +00:00
Elliott Hughes 78104182ac am d9e3bc3f: Merge "Use bionic\'s <linux/fuse.h>."
* commit 'd9e3bc3f422fcae5a800483275da9fc950ab7f7a':
  Use bionic's <linux/fuse.h>.
2014-05-07 22:54:25 +00:00
Elliott Hughes 4776e2e432 am 1f64d7e1: am b4866128: Merge "Fix mips debuggerd <corkscrew/ptrace.h> build breakage."
* commit '1f64d7e14c0e6c8f5b142d6eb942608f2951f4a7':
  Fix mips debuggerd <corkscrew/ptrace.h> build breakage.
2014-05-07 22:53:33 +00:00
Ying Wang 803fb62bb4 Merge "Remove unused LOCAL_LDLIBS." 2014-05-07 22:50:48 +00:00
Elliott Hughes d9e3bc3f42 Merge "Use bionic's <linux/fuse.h>." 2014-05-07 22:47:46 +00:00
Elliott Hughes 1f64d7e14c am b4866128: Merge "Fix mips debuggerd <corkscrew/ptrace.h> build breakage."
* commit 'b48661289ad5b31afd2fa6e406caa0dca1c80230':
  Fix mips debuggerd <corkscrew/ptrace.h> build breakage.
2014-05-07 22:47:17 +00:00
Elliott Hughes b48661289a Merge "Fix mips debuggerd <corkscrew/ptrace.h> build breakage." 2014-05-07 22:44:09 +00:00
Elliott Hughes 99d4a697c7 Fix mips debuggerd <corkscrew/ptrace.h> build breakage.
The uapi headers have everything we need, and the corkscrew
header files have been removed.

Change-Id: I274b44463638112f1ab290926094c094c9253586
2014-05-07 15:42:41 -07:00
Ying Wang 9f437d7181 Remove unused LOCAL_LDLIBS.
Change-Id: I42aeb7668183e7a06207ee063f6eee4d37d66c6e
2014-05-07 15:36:05 -07:00
Elliott Hughes be6b3ad1f0 am d1c807a8: am 22a289a0: am 7112e4c7: Merge "Remove the dead corkscrew header files too."
* commit 'd1c807a8807dc85ce5efe7997b440b3a5dc2e4d3':
  Remove the dead corkscrew header files too.
2014-05-07 22:35:26 +00:00
Elliott Hughes ea2185acf3 am 91070a5e: am 5503f774: am 2c55b454: Merge "Switch to the new bionic fatal logging interface."
* commit '91070a5ef29e3ebea45e23492dae56690f5fc1bc':
  Switch to the new bionic fatal logging interface.
2014-05-07 22:35:25 +00:00
Sasha Levitskiy 40aa6967e1 am b59e7e6b: am a744f0a1: Merge "System: Fastboot: warning fixit, misc bugs and cleanup."
* commit 'b59e7e6b2165809e971a754796d766e1de2bd324':
  System: Fastboot: warning fixit, misc bugs and cleanup.
2014-05-07 22:09:46 +00:00
Sasha Levitskiy b59e7e6b21 am a744f0a1: Merge "System: Fastboot: warning fixit, misc bugs and cleanup."
* commit 'a744f0a11a4ff2e4a84a0af8e8e98e2e38babc32':
  System: Fastboot: warning fixit, misc bugs and cleanup.
2014-05-07 22:04:01 +00:00
Sasha Levitskiy a744f0a11a Merge "System: Fastboot: warning fixit, misc bugs and cleanup." 2014-05-07 21:59:12 +00:00
Elliott Hughes 60281d556d Use bionic's <linux/fuse.h>.
No need for an out-of-date copy of a uapi header.

Change-Id: Iec68c6ceb2bceca1ceef0c57e0b45a89a139e292
2014-05-07 14:39:58 -07:00
JP Abgrall 00ff7e0636 am de9033e7: am a2f51837: am 66e952e2: Merge "fastboot: support for overriding format fs-type and size"
* commit 'de9033e7e08622bc6e16c9a675ea7ecd7b27f3db':
  fastboot: support for overriding format fs-type and size
2014-05-07 21:33:01 +00:00
Mark Salyzyn e3019eb7d5 am 31cbd168: am 7455f988: am 9570d837: Merge "logd: logcat: Add persist.logd.size group of properties"
* commit '31cbd168fcdd577ca4cdd0e725c3d3b21e438e40':
  logd: logcat: Add persist.logd.size group of properties
2014-05-07 21:22:02 +00:00
Mark Salyzyn 8261991ad4 am fe48dbe4: am 69894109: am 5c02b276: Merge "logd: default off by-UID spam filter"
* commit 'fe48dbe40aee39deeb2d6ed67da6a73f3bc46978':
  logd: default off by-UID spam filter
2014-05-07 21:22:01 +00:00
Elliott Hughes d1c807a880 am 22a289a0: am 7112e4c7: Merge "Remove the dead corkscrew header files too."
* commit '22a289a0b6fcb1c0edc372e477c876819749addd':
  Remove the dead corkscrew header files too.
2014-05-07 20:28:45 +00:00
Elliott Hughes 91070a5ef2 am 5503f774: am 2c55b454: Merge "Switch to the new bionic fatal logging interface."
* commit '5503f77495dd41f44a3d287f1f2de8fd8087198c':
  Switch to the new bionic fatal logging interface.
2014-05-07 20:28:29 +00:00
JP Abgrall de9033e7e0 am a2f51837: am 66e952e2: Merge "fastboot: support for overriding format fs-type and size"
* commit 'a2f518378a8e06eacd0fd0f71169a4b6a46ef068':
  fastboot: support for overriding format fs-type and size
2014-05-07 19:44:42 +00:00
Mark Salyzyn 31cbd168fc am 7455f988: am 9570d837: Merge "logd: logcat: Add persist.logd.size group of properties"
* commit '7455f9885d8420d20616d524ba6bb0ae301122b0':
  logd: logcat: Add persist.logd.size group of properties
2014-05-07 19:37:24 +00:00
Mark Salyzyn fe48dbe40a am 69894109: am 5c02b276: Merge "logd: default off by-UID spam filter"
* commit '69894109c1c706fa0daa1448ddad1b9f09dee15f':
  logd: default off by-UID spam filter
2014-05-07 19:37:10 +00:00
Mark Salyzyn e6ed68bdf3 lmkd: turn on -Werror
- Deal with some -Wunused issues

Change-Id: Id037c44a0ca2d00ae10a939fb001bc24a3e9410c
2014-05-07 12:27:29 -07:00
Sasha Levitskiy 782111b3bc System: Fastboot: warning fixit, misc bugs and cleanup.
Change-Id: Ib8517a852977962de3f05c879ba7dce89bcef644
Signed-off-by: Sasha Levitskiy <sanek@google.com>
2014-05-07 11:43:12 -07:00
Elliott Hughes 22a289a0b6 am 7112e4c7: Merge "Remove the dead corkscrew header files too."
* commit '7112e4c7cb9168ddaee418c4ed4b0c54b475f99e':
  Remove the dead corkscrew header files too.
2014-05-07 17:12:24 +00:00
Elliott Hughes 7112e4c7cb Merge "Remove the dead corkscrew header files too." 2014-05-07 17:07:41 +00:00
Elliott Hughes ddbdae8c3f Remove the dead corkscrew header files too.
Change-Id: I0dd5cf3966994db19d98f60805211ed39099465a
2014-05-07 09:38:04 -07:00
Elliott Hughes 5503f77495 am 2c55b454: Merge "Switch to the new bionic fatal logging interface."
* commit '2c55b454c7a9df44ebd6128a2951187be4971702':
  Switch to the new bionic fatal logging interface.
2014-05-07 04:07:39 +00:00
Elliott Hughes 2c55b454c7 Merge "Switch to the new bionic fatal logging interface." 2014-05-07 04:04:39 +00:00
Elliott Hughes 26864bf9cb Switch to the new bionic fatal logging interface.
This is more general and will work for anyone's custom logging
code, as long as they use ANDROID_LOG_FATAL priority.

Change-Id: Iaf7fc0858fce04f3af407882a58ee5a827d50ddd
2014-05-06 20:40:15 -07:00
JP Abgrall a2f518378a am 66e952e2: Merge "fastboot: support for overriding format fs-type and size"
* commit '66e952e254c9bda46d5ef9614027b18d0a7a6c8e':
  fastboot: support for overriding format fs-type and size
2014-05-07 02:21:13 +00:00
JP Abgrall 66e952e254 Merge "fastboot: support for overriding format fs-type and size" 2014-05-07 02:16:06 +00:00
JP Abgrall 7e85974fc2 fastboot: support for overriding format fs-type and size
This changes allows overriding the fs-type and size that
are normally returned by the booloader.

This is in preparation for supporting other FSes.

Change-Id: I8d141a0d4d14df9fe84d3b131484e9696fcd8870
Signed-off-by: JP Abgrall <jpa@google.com>
2014-05-06 15:14:15 -07:00
Mark Salyzyn 7455f9885d am 9570d837: Merge "logd: logcat: Add persist.logd.size group of properties"
* commit '9570d8378c32873169d561d039179a1ba2f5435e':
  logd: logcat: Add persist.logd.size group of properties
2014-05-06 22:03:45 +00:00
Mark Salyzyn 9570d8378c Merge "logd: logcat: Add persist.logd.size group of properties" 2014-05-06 22:00:11 +00:00
Mark Salyzyn 671e343c7d logd: logcat: Add persist.logd.size group of properties
- logd Add persist.logd.size (global), persist.logd.size.<logid>
- logcat report a more flexible multiplier in -g command.

Bug: 14563261
Bug: 14469172
Change-Id: Ie389caa14ad3ae3d4a3a3cc463425bb9dbc5e483
2014-05-06 14:58:41 -07:00
Mark Salyzyn 69894109c1 am 5c02b276: Merge "logd: default off by-UID spam filter"
* commit '5c02b2760e11e8b77452c345c788e4cda289f788':
  logd: default off by-UID spam filter
2014-05-06 21:45:18 +00:00
Mark Salyzyn 5c02b2760e Merge "logd: default off by-UID spam filter" 2014-05-06 21:32:23 +00:00
Mark Salyzyn 4141cb2391 logd: default off by-UID spam filter
Bug: 14469172
Change-Id: I37c8dbcea0490afb994cbe6f033591fea1c58bc8
2014-05-06 13:50:28 -07:00
JP Abgrall 191e3b707a am e95a90e5: am 1762dbfb: am 2d2fd4cd: Merge changes Ibff1f74e,Ic82595cf,If4e01cab
* commit 'e95a90e5995d1121080b5da09d75d53093af8818':
  fastboot: Added tos as an optional image
  fastboot: Fixed optional entries
  fastboot: allow format on devices with small buffers
2014-05-06 19:40:37 +00:00
JP Abgrall e95a90e599 am 1762dbfb: am 2d2fd4cd: Merge changes Ibff1f74e,Ic82595cf,If4e01cab
* commit '1762dbfbab7caab7f7e57aaaa5e1491e96e55d42':
  fastboot: Added tos as an optional image
  fastboot: Fixed optional entries
  fastboot: allow format on devices with small buffers
2014-05-06 19:38:33 +00:00
JP Abgrall 1762dbfbab am 2d2fd4cd: Merge changes Ibff1f74e,Ic82595cf,If4e01cab
* commit '2d2fd4cdeac031e78a63c40d01a96a93ebb3eed8':
  fastboot: Added tos as an optional image
  fastboot: Fixed optional entries
  fastboot: allow format on devices with small buffers
2014-05-06 19:35:34 +00:00
JP Abgrall 2d2fd4cdea Merge changes Ibff1f74e,Ic82595cf,If4e01cab
* changes:
  fastboot: Added tos as an optional image
  fastboot: Fixed optional entries
  fastboot: allow format on devices with small buffers
2014-05-06 19:32:17 +00:00
Daniel Rosenberg 73a4ad288f fastboot: Added tos as an optional image
Change-Id: Ibff1f74ee4a949501ceae0b897f896067f022763
Signed-off-by: Daniel Rosenberg <drosen@google.com>
2014-05-06 12:28:41 -07:00
Daniel Rosenberg 82280594ef fastboot: Fixed optional entries
Previously, if an image was listed as optional, but was not found,
flashall would fail. Now it will proceed if optional images are not
present.

Change-Id: Ic82595cf0cd6ddce4c676de590f03f1a95f32040
Signed-off-by: Daniel Rosenberg <drosen@google.com>
2014-05-06 12:28:39 -07:00
Dmitry Grinberg e6f3e9bd26 fastboot: allow format on devices with small buffers
Formatting large partitions on devices with small transfer buffers did
not work before since format used a strange path through the code to
send data. It now uses the normal path. Also cleaned up a bit. FS
code now lives in a separate file and the custom path for format is
gone.

Change-Id: If4e01cabc2e250b7c02ca7ce8c268e51d49e1529
2014-05-06 12:28:37 -07:00
Ying Wang 88fda250b5 am 08651274: am 27e3913b: am 52dd7cc0: Merge "Fix 64-bit host build."
* commit '0865127430b7651a96115999ca41a3fe0974f4e7':
  Fix 64-bit host build.
2014-05-06 18:52:05 +00:00
Ying Wang 0865127430 am 27e3913b: am 52dd7cc0: Merge "Fix 64-bit host build."
* commit '27e3913b7c95aa15061368f50aada7b6b7c71eb2':
  Fix 64-bit host build.
2014-05-06 18:46:09 +00:00
Ying Wang 27e3913b7c am 52dd7cc0: Merge "Fix 64-bit host build."
* commit '52dd7cc0bddbe6092f818827efd584466234d67b':
  Fix 64-bit host build.
2014-05-06 18:43:27 +00:00