Greg Hackmann
86cdce1aab
am f52338fe: Merge "rootdir: enable armv8_deprecated swp hook"
...
* commit 'f52338fe1e8f74123a895db591d6a2a53061a2b1':
rootdir: enable armv8_deprecated swp hook
2015-02-05 23:21:19 +00:00
Greg Hackmann
f52338fe1e
Merge "rootdir: enable armv8_deprecated swp hook"
2015-02-05 23:09:14 +00:00
Greg Hackmann
cee8757f92
rootdir: enable armv8_deprecated swp hook
...
The upstream kernel now includes support for emulating legacy AArch32
instructions on ARMv8 devices. By default this framework emulates
deprecated instructions but not obsolete instructions.
Android requires support for the obsolete SWP and SWPB instructions on
all ARM devices, so override this default for the swp emulation hook.
Change-Id: I82b9bdb564413ec7c1a101da75a9928aebe1606b
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2015-02-05 13:38:58 -08:00
Elliott Hughes
dcbeb41a67
am d558530b: Merge "Fix Windows build."
...
* commit 'd558530ba90cb6218fe8e255c71a034c3fe1ea58':
Fix Windows build.
2015-02-05 18:51:07 +00:00
Elliott Hughes
984e01e54e
am 6c3ff4fe: Merge "Fix Windows build."
...
* commit '6c3ff4fe7f0b1cd729bf61974dde845b611b99c0':
Fix Windows build.
2015-02-05 18:47:24 +00:00
Elliott Hughes
05d8a22c2d
am 051f369a: Merge "Build BSD grep separately from toolbox."
...
* commit '051f369a14a405dc6dbaf708dc51a21c5629bf88':
Build BSD grep separately from toolbox.
2015-02-05 18:47:23 +00:00
Elliott Hughes
d558530ba9
Merge "Fix Windows build."
2015-02-05 16:23:41 +00:00
Elliott Hughes
d79801d60d
Fix Windows build.
...
Take 2. Probably should have done this in the beginning, but thought I was
being clever.
Change-Id: I85c6e487eece9bcc75f8f62c850c2d4d1ee9e908
2015-02-05 08:21:37 -08:00
Elliott Hughes
6c3ff4fe7f
Merge "Fix Windows build."
2015-02-05 03:40:07 +00:00
Elliott Hughes
31fa09c1c6
Fix Windows build.
...
Only two days in, and I'm already really regretting putting this code
somewhere that builds for Mac OS and Windows...
Change-Id: I576ee4a9e647e10dc2d47c7e1e38aedee2bf404c
2015-02-04 19:38:28 -08:00
Elliott Hughes
051f369a14
Merge "Build BSD grep separately from toolbox."
2015-02-05 03:36:07 +00:00
Elliott Hughes
d20218e05d
Build BSD grep separately from toolbox.
...
Also move the dd-only library code into the dd section (so a future
maintainer will know to keep/remove them as a block) and fix the one
build warning remaining.
Change-Id: Ibf6b28ef05e4cbb70b9308b0f4387f5af5b7fa94
2015-02-04 18:50:14 -08:00
Elliott Hughes
b936dfcdbf
am 1dee489c: Merge "Stop using #if for conditional compilation."
...
* commit '1dee489ceaa9dfb6b6609f97380f20b0753eb2c1':
Stop using #if for conditional compilation.
2015-02-05 02:31:32 +00:00
Elliott Hughes
44fdd5d15a
am 27d28d3b: Merge "Add a WriteStringToFile overload that cares about permissions."
...
* commit '27d28d3baff860d1fd936a5fcf2d920577c52575':
Add a WriteStringToFile overload that cares about permissions.
2015-02-05 02:31:31 +00:00
Elliott Hughes
1dee489cea
Merge "Stop using #if for conditional compilation."
2015-02-05 01:16:29 +00:00
Elliott Hughes
c0e919c920
Stop using #if for conditional compilation.
...
Use regular 'if' to prevent bitrot.
Also remove remaining typedefs.
Change-Id: I2e6ca928e2db29b88b643cf990ff05cfb0be94a6
2015-02-04 17:16:11 -08:00
Elliott Hughes
27d28d3baf
Merge "Add a WriteStringToFile overload that cares about permissions."
2015-02-04 22:43:02 +00:00
Elliott Hughes
202f024dee
Add a WriteStringToFile overload that cares about permissions.
...
Change-Id: I857a80b61768d4e9610bdd149eff2d9d8e48d2c0
2015-02-04 14:30:23 -08:00
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