Commit graph

12452 commits

Author SHA1 Message Date
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
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
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
Dan Albert
301fb4d6c9 am ca2b67e1: Merge "Additional cleanup of start_device_log."
* commit 'ca2b67e1173221a2223164d977eeaf16a646e853':
  Additional cleanup of start_device_log.
2015-03-20 20:24:38 +00:00
Dan Albert
ca2b67e117 Merge "Additional cleanup of start_device_log." 2015-03-20 20:18:59 +00:00
Mark Salyzyn
97c1c2beee logd: optimize statistics
- Go back to basic requirements
- Simplify
- use hash tables to minimize memory impact

Bug: 19608965
Change-Id: If7becb34354d6415e5c387ecea7d4109a15259c8
2015-03-20 12:31:23 -07:00
Dan Stoza
8016aa7a05 am e0f14601: (-s ours) am ca87790c: (-s ours) Merge "DO NOT MERGE Add ANativeWindow dataSpace; update graphics formats, color spaces"
* commit 'e0f146015d35fdc8d870863abb5728f4086925d6':
  DO NOT MERGE Add ANativeWindow dataSpace; update graphics formats, color spaces
2015-03-20 18:37:18 +00:00
Dan Stoza
e0f146015d am ca87790c: (-s ours) Merge "DO NOT MERGE Add ANativeWindow dataSpace; update graphics formats, color spaces"
* commit 'ca87790cdccdb0ee17fb4069e6d4ed1e7b4e2ee0':
  DO NOT MERGE Add ANativeWindow dataSpace; update graphics formats, color spaces
2015-03-20 18:33:33 +00:00
Dan Stoza
ca87790cdc Merge "DO NOT MERGE Add ANativeWindow dataSpace; update graphics formats, color spaces" 2015-03-20 18:28:00 +00:00
Elliott Hughes
12235947eb Remove /dev/alarm cruft from uptime.
Our uptime is very different from the regular one, and usefully so, so
this code will live on. Remove dead bits.

Also fix the annoying "1 days" bug while I'm here.

Change-Id: Ied5403ba96dcc5eddd4d386b59c6fcdea3209881
2015-03-20 11:14:50 -07:00
Elliott Hughes
f8eea80110 am b721e8f4: Merge "Clean up property setting code."
* commit 'b721e8f4d2f62ffaadef7ec0ff15dada778e286d':
  Clean up property setting code.
2015-03-20 17:27:20 +00:00
Elliott Hughes
b721e8f4d2 Merge "Clean up property setting code." 2015-03-20 17:13:29 +00:00
Elliott Hughes
9b8e3cd8f5 am 1b8dbe74: Merge "Lose bootmode and console globals."
* commit '1b8dbe74412dd27f2950e0c84feaf09c5b7dcbf0':
  Lose bootmode and console globals.
2015-03-20 17:10:50 +00:00
Elliott Hughes
db3f267c99 Clean up property setting code.
In particular, ensure that all property_set failures are reported.

Change-Id: Iab94a28bcba2346868c0f39bcfe26e55a2c55562
2015-03-20 10:03:32 -07:00
Dan Albert
8743ef9841 Additional cleanup of start_device_log.
Addresses nnk's post commit review comments on
https://android-review.googlesource.com/#/c/139381/

Remove unneeded code for creating /data/adb.

Add an O_CLOEXEC.

Move the closing of stdin out to main().

Append the pid of the current process to the log file to avoid
clobbering the log if the process crashes and restarts within the same
second.

Change-Id: Ide0be86b4b33256486634c29ba02efaf10cf913d
2015-03-20 09:49:15 -07:00
Elliott Hughes
1b8dbe7441 Merge "Lose bootmode and console globals." 2015-03-20 16:29:37 +00:00
Sami Tolvanen
54bac178ce am ddd0639e: Merge "Add init command to set verified properties"
* commit 'ddd0639e7e1bb2e02c8e424f45924a44b8f70022':
  Add init command to set verified properties
2015-03-20 16:11:13 +00:00
Sami Tolvanen
ddd0639e7e Merge "Add init command to set verified properties" 2015-03-20 15:59:33 +00:00
Elliott Hughes
d679bc9e56 Lose bootmode and console globals.
Also remove some code marked "TODO: these are obsolete. We should delete
them".

Change-Id: I6255cee4cb6680bfcbc5b46366990309cba95037
2015-03-20 08:58:42 -07:00
Dan Albert
8d3293ee2c am 4b8b38f4: Merge "Use mingw on Windows."
* commit '4b8b38f4e5f216f317d9837de49468b32be86984':
  Use mingw on Windows.
2015-03-20 05:59:34 +00:00
Dan Albert
4b8b38f4e5 Merge "Use mingw on Windows." 2015-03-20 05:48:19 +00:00
Dan Albert
9c5c08be37 Use mingw on Windows.
LOCAL_CLANG := true is a no-op on Linux/Darwin host builds, but
apparently moves Windows binaries from mingw to clang, which is
completely untested.

Change-Id: Ibbc468d4a19a9e36bbcb93aa030fcc771af020ba
2015-03-19 22:44:50 -07:00
Dan Albert
ac81bf51a4 am 44ec5822: Merge "Use text based trace masks for adbd."
* commit '44ec58221f0128bf6ea31d49bb80dde8db083379':
  Use text based trace masks for adbd.
2015-03-20 05:04:49 +00:00
Dan Albert
44ec58221f Merge "Use text based trace masks for adbd." 2015-03-20 04:53:06 +00:00
Dan Albert
ea2175ab6b Use text based trace masks for adbd.
Previously the adbd trace mask had to be set as raw hex rather than
with the colon separated list. We all have better things to do than
memorize bitmasks, so make adbd use the same trace mask setting code
as adb.

Change-Id: I0bf0ab61c070d06d1cc2acf1ed90b2b77ccd261b
2015-03-19 21:50:10 -07:00
Dan Albert
3b2774c1c3 am a16b0f4c: Merge "The generic failure case disappeared..."
* commit 'a16b0f4c3a7b6546690cbdbd3d63b5cdd2da4149':
  The generic failure case disappeared...
2015-03-20 04:02:40 +00:00