Commit Graph

11856 Commits

Author SHA1 Message Date
Elliott Hughes f86b0496b5 am aec43a12: Merge "Use TEMP_FAILURE_RETRY, always build bootchart.cpp."
* commit 'aec43a12a76160e924fc0af9b131bd385cf7a60c':
  Use TEMP_FAILURE_RETRY, always build bootchart.cpp.
2015-02-04 18:45:23 +00:00
Elliott Hughes 7d3b484690 am 798219e9: Merge "Fix clang "ueventd.cpp:111:1: error: no return statement in function returning non-void"."
* commit '798219e9e9137db272585f5dc5683df91ed5beb1':
  Fix clang "ueventd.cpp:111:1: error: no return statement in function returning non-void".
2015-02-04 18:38:16 +00:00
Elliott Hughes aec43a12a7 Merge "Use TEMP_FAILURE_RETRY, always build bootchart.cpp." 2015-02-04 18:37:32 +00:00
Elliott Hughes 24627906bf Use TEMP_FAILURE_RETRY, always build bootchart.cpp.
Also switch the revision parsing over to sscanf as promised. I haven't
done the hardware parsing because I don't yet know whether we actually need
to keep the space-stripping code.

Change-Id: Ic33378345cd515cb08d00c543acf44eb72673396
2015-02-04 10:25:09 -08:00
Elliott Hughes 798219e9e9 Merge "Fix clang "ueventd.cpp:111:1: error: no return statement in function returning non-void"." 2015-02-04 18:20:33 +00:00
Elliott Hughes 2145779c87 Fix clang "ueventd.cpp:111:1: error: no return statement in function returning non-void".
Change-Id: I69c9e5534975bffa0fbf98ca4af50400f6b94aa0
2015-02-04 10:19:50 -08:00
Elliott Hughes 19fbf945ab am e939e704: Merge "Build init as C++."
* commit 'e939e70401c256df18ee614d69c2fbed41e0ad43':
  Build init as C++.
2015-02-04 17:27:58 +00:00
Elliott Hughes e939e70401 Merge "Build init as C++." 2015-02-04 17:17:25 +00:00
Elliott Hughes f3cf438714 Build init as C++.
This is just the minimal change to keep it building.

Change-Id: I245c5b8413a1db114576c81462eb5737f5ffcef2
2015-02-04 08:59:10 -08:00
Mark Salyzyn d7839f9e09 am 04b30a06: Merge "logd: logd placed into background cgroup"
* commit '04b30a06380dd64fac6812ed438d25da0c99a849':
  logd: logd placed into background cgroup
2015-02-04 15:49:38 +00:00
Mark Salyzyn 04b30a0638 Merge "logd: logd placed into background cgroup" 2015-02-04 15:27:58 +00:00
Mark Salyzyn 56ba4b5b77 logd: logd placed into background cgroup
Change-Id: I38d7be05ab77fc944a9dbef2b6575d4caa920d08
2015-02-04 01:38:34 +00:00
Dmitriy Ivanov b83add4d71 am 5204b158: Merge "Fix x86_64 build"
* commit '5204b1580e0d0f38272c7da166eee9b88c14dc50':
  Fix x86_64 build
2015-02-04 01:26:40 +00:00
Elliott Hughes 8a2634c2ab am 55732f49: Merge "android_reboot should take a const char*."
* commit '55732f49287a75f9baabe9f150443aec9234c90d':
  android_reboot should take a const char*.
2015-02-04 01:20:40 +00:00
Dmitriy Ivanov 5204b1580e Merge "Fix x86_64 build" 2015-02-04 01:15:37 +00:00
Elliott Hughes 55732f4928 Merge "android_reboot should take a const char*." 2015-02-04 01:11:39 +00:00
Dmitriy Ivanov 3107a2f5f2 Fix x86_64 build
Change-Id: Iaa3a641907de55b398a3bdd0bbc63cbb9d367982
2015-02-03 16:43:15 -08:00
Elliott Hughes 0068da6a93 android_reboot should take a const char*.
The kernel argument is actually a void*, but it's only read from.

Change-Id: I305c50249bf12b7fbdea4721257aed52a0372f8d
2015-02-03 15:44:16 -08:00
Elliott Hughes 14fcc4c66c am e44d25d6: Merge "Add Google-style StringPrintf."
* commit 'e44d25d64537f4ea2abcb56aabc7a5bf0731c222':
  Add Google-style StringPrintf.
2015-02-03 23:33:39 +00:00
Elliott Hughes e44d25d645 Merge "Add Google-style StringPrintf." 2015-02-03 23:23:11 +00:00
Elliott Hughes 6b3be2902d Add Google-style StringPrintf.
Change-Id: If333c28b8ed047346a2dd85e591c4bedbab874cc
2015-02-03 15:21:07 -08:00
Elliott Hughes 0642403c4f am d4a6fc5b: Merge "Init: Fix Clang unsupported attributes"
* commit 'd4a6fc5bc205d516e5bf05cafc5b6eadb4e0b372':
  Init: Fix Clang unsupported attributes
2015-02-03 23:04:41 +00:00
Elliott Hughes d4a6fc5bc2 Merge "Init: Fix Clang unsupported attributes" 2015-02-03 22:51:47 +00:00
Elliott Hughes c3bf8d85b5 am 9fc43358: Merge "Extra Win32 compatibility."
* commit '9fc43358f72a581beb26532ea2cb1f2adc053758':
  Extra Win32 compatibility.
2015-02-03 22:36:57 +00:00
Elliott Hughes 9fc43358f7 Merge "Extra Win32 compatibility." 2015-02-03 22:27:42 +00:00
Elliott Hughes 714196d05c Extra Win32 compatibility.
Change-Id: Ibc583aba580f4fc15c243f495ead44b2ce4c6e5e
2015-02-03 14:26:58 -08:00
Elliott Hughes 703237a5b0 am 6c6f3967: Merge "Fix Mac build."
* commit '6c6f39678cf41a52826b4b4551f39d8256855f54':
  Fix Mac build.
2015-02-03 21:14:13 +00:00
Elliott Hughes 6c6f39678c Merge "Fix Mac build." 2015-02-03 21:03:45 +00:00
Elliott Hughes af4885a4a8 Fix Mac build.
I knew I should have created a new library that doesn't build for the
Mac or Windows rather than adding to libutils...

Change-Id: I7c07eaa93affb7e83d4da384f03652c39065562a
2015-02-03 13:02:57 -08:00
Elliott Hughes 813d0ac136 am 6974ba4e: Merge "Add Google-style ReadFileToString and WriteStringToFile."
* commit '6974ba4ed430ec3247c3a5c04a2263b4b04ff827':
  Add Google-style ReadFileToString and WriteStringToFile.
2015-02-03 20:33:00 +00:00
Elliott Hughes 6974ba4ed4 Merge "Add Google-style ReadFileToString and WriteStringToFile." 2015-02-03 20:19:08 +00:00
Elliott Hughes 71b88c72b7 am 8457a7f9: Merge "Remove netcfg\'s unused options."
* commit '8457a7f9aae334eecbc538c3ee41cdd267b3eb6b':
  Remove netcfg's unused options.
2015-02-03 20:18:41 +00:00
Elliott Hughes dec12b2b71 Add Google-style ReadFileToString and WriteStringToFile.
Bug: 19217569
Change-Id: I64789d3fa6777ee30a324cdf00fdc275c1230e1b
2015-02-03 12:18:11 -08:00
Elliott Hughes dbf6f33e84 am 2b2b7632: Merge "Revert "Remove netcfg\'s unused options.""
* commit '2b2b7632f55ca73562361cf4d06e60e7b62f7ff4':
  Revert "Remove netcfg's unused options."
2015-02-03 20:09:30 +00:00
Elliott Hughes 8457a7f9aa Merge "Remove netcfg's unused options." 2015-02-03 20:01:13 +00:00
Elliott Hughes 187eade127 Remove netcfg's unused options.
Only "netcfg" for a list of interfaces and "netcfg <interface> dhcp" still
seem to be used.

Change-Id: I9f0b580474258fa648deb5287f98d8ec5533ca6f
2015-02-03 11:59:22 -08:00
Elliott Hughes 2b2b7632f5 Merge "Revert "Remove netcfg's unused options."" 2015-02-03 19:56:43 +00:00
Elliott Hughes c463025a19 Revert "Remove netcfg's unused options."
This reverts commit f8e83054cb.

Change-Id: Iede772f96ff9008277df433dcbb5f6603de65283
2015-02-03 19:56:35 +00:00
Andreas Gampe f93f8903f7 am 4fd6d501: Merge "Init: Fix literal"
* commit '4fd6d50181491f178f7ad7c6c094cbd18ed42ef6':
  Init: Fix literal
2015-02-03 19:43:53 +00:00
Andreas Gampe 4fd6d50181 Merge "Init: Fix literal" 2015-02-03 19:32:36 +00:00
Andreas Gampe 0ab46c9e2b Init: Fix literal
This is a literal 0 implicitly converted to a NULL.

Change-Id: I0573e85eb0578f938877c4bec79054081c27e661
2015-02-03 11:31:11 -08:00
Andreas Gampe fe2fb359d6 Init: Fix Clang unsupported attributes
Make attributes conditional on not compiling with Clang.

Change-Id: Ic4e9b382308651c7b1901bfa192b6591672dc5ab
2015-02-03 11:25:26 -08:00
Elliott Hughes b862d3e8eb am 6a728fde: Merge "Remove netcfg\'s unused options."
* commit '6a728fde77d1367318c79e5b182f0cb316872a37':
  Remove netcfg's unused options.
2015-02-03 19:16:42 +00:00
Elliott Hughes 5b253e55e0 am ef89e8d1: Merge "Revert "Remove netcfg\'s unused options.""
* commit 'ef89e8d14619c68015103fd51ff75f82eeef8d61':
  Revert "Remove netcfg's unused options."
2015-02-03 19:16:42 +00:00
Elliott Hughes 1ddbd76bd8 am 67900498: Merge "Remove netcfg\'s unused options."
* commit '67900498cff54c8116b3f7afc84e046d98bb17e4':
  Remove netcfg's unused options.
2015-02-03 19:12:53 +00:00
Elliott Hughes 6a728fde77 Merge "Remove netcfg's unused options." 2015-02-03 19:09:27 +00:00
Elliott Hughes f8e83054cb Remove netcfg's unused options.
Only "netcfg" for a list of interfaces and "netcfg <interface> dhcp" still
seem to be used.

Change-Id: Iaf499c06b09ffe5e0925339b9cd6e502f3234a86
2015-02-03 11:08:07 -08:00
Elliott Hughes ef89e8d146 Merge "Revert "Remove netcfg's unused options."" 2015-02-03 19:08:01 +00:00
Elliott Hughes ca77255c26 Revert "Remove netcfg's unused options."
This reverts commit 24c1885bc1.

Change-Id: Iaae6502e2db90d67b4275faa104cfc6a0abc65c6
2015-02-03 19:07:43 +00:00
Elliott Hughes 67900498cf Merge "Remove netcfg's unused options." 2015-02-03 19:01:21 +00:00