Elliott Hughes
230e98bfea
am 36ff3bd2
: am e8c6d15b
: am 59644a6c
: Merge "Fix nandread to build with old or uapi headers."
...
* commit '36ff3bd273d9f60822104eb53f3aa1886160b360':
Fix nandread to build with old or uapi headers.
2013-11-11 20:52:05 -08:00
Elliott Hughes
36ff3bd273
am e8c6d15b
: am 59644a6c
: Merge "Fix nandread to build with old or uapi headers."
...
* commit 'e8c6d15b1892ffd09dae8ac7922854140a11130d':
Fix nandread to build with old or uapi headers.
2013-11-11 16:33:30 -08:00
Elliott Hughes
e8c6d15b18
am 59644a6c
: Merge "Fix nandread to build with old or uapi headers."
...
* commit '59644a6c7182db6caf53dc61f448f2c68ff569be':
Fix nandread to build with old or uapi headers.
2013-11-11 16:31:57 -08:00
Elliott Hughes
59644a6c71
Merge "Fix nandread to build with old or uapi headers."
2013-11-12 00:29:10 +00:00
Elliott Hughes
b05a2e5130
Fix nandread to build with old or uapi headers.
...
Bug: 11559337
Change-Id: I9795a16649dafdfe3df150170265157170cd5a79
2013-11-11 16:17:49 -08:00
Christopher Ferris
7f3c8f9c5b
Remove hack for mingw compiler.
...
The __BEGIN_DECLS/__END_DECLS macro is now defined for mingw.
Change-Id: Icd09b92a83e982ac0ed3eb34df4c1d79de21941e
2013-11-08 16:26:59 -08:00
Narayan Kamath
ab9189893d
Fix mingw windows host build.
...
__BEGIN_DECLS isn't defined on this platform and
it appears to be missing sys/cdefs.h
Change-Id: I13cc557700198590cf717e3007dee738043ac3bf
2013-11-08 15:59:46 +00:00
Christopher Ferris
e70f95f349
am 90e67bcd
: am d36bfc30
: am e6279294
: Merge "Revert "Revert enabling libunwind.""
...
* commit '90e67bcdc383d552dc5325039c86b5bef5429b05':
Revert "Revert enabling libunwind."
2013-11-07 21:30:34 -08:00
Christopher Ferris
90e67bcdc3
am d36bfc30
: am e6279294
: Merge "Revert "Revert enabling libunwind.""
...
* commit 'd36bfc30ae5fa86b4c3fd8248e5ee16f479250b6':
Revert "Revert enabling libunwind."
2013-11-07 19:16:25 -08:00
Christopher Ferris
d36bfc30ae
am e6279294
: Merge "Revert "Revert enabling libunwind.""
...
* commit 'e627929490dfb92ab51ec6feb259d793a4a9f394':
Revert "Revert enabling libunwind."
2013-11-07 19:14:31 -08:00
Christopher Ferris
e627929490
Merge "Revert "Revert enabling libunwind.""
2013-11-08 03:12:04 +00:00
Christopher Ferris
e6feaeeda1
Revert "Revert enabling libunwind."
...
This reverts commit db2309e3d1
.
Change-Id: I1626442f029473066ce20921667a406f1a1ea865
2013-11-08 02:59:52 +00:00
Elliott Hughes
d283d93489
am 8ddd08b1
: am 4ae94541
: am 62ea993a
: Merge "Revert enabling libunwind."
...
* commit '8ddd08b1f24d361ace9cd78198664db4bf7e1325':
Revert enabling libunwind.
2013-11-07 09:44:32 -08:00
Elliott Hughes
8ddd08b1f2
am 4ae94541
: am 62ea993a
: Merge "Revert enabling libunwind."
...
* commit '4ae94541b82dde787b0e2c46f1a4f2524572c1c4':
Revert enabling libunwind.
2013-11-07 09:41:57 -08:00
Elliott Hughes
1707bf0320
am 2ee98591
: am fde641ee
: am 30296f28
: Merge "Let external/mksh install directly into /system/bin/sh."
...
* commit '2ee985913f4c7e082fc68e6896698d9fa117c474':
Let external/mksh install directly into /system/bin/sh.
2013-11-07 09:01:24 -08:00
Christopher Ferris
3c8b229f60
am c3920dee
: am 11d04d04
: am 351b0123
: Merge "Enable libunwind on arm platforms."
...
* commit 'c3920dee104856025f9416670efd7f05d1acd3a0':
Enable libunwind on arm platforms.
2013-11-07 09:01:24 -08:00
Elliott Hughes
4ae94541b8
am 62ea993a
: Merge "Revert enabling libunwind."
...
* commit '62ea993a6997701dba7735ca4a4af6fc6cabac2c':
Revert enabling libunwind.
2013-11-07 09:01:20 -08:00
Elliott Hughes
2ee985913f
am fde641ee
: am 30296f28
: Merge "Let external/mksh install directly into /system/bin/sh."
...
* commit 'fde641ee24b7a0a5d1fb6e2532153f1bb8504aea':
Let external/mksh install directly into /system/bin/sh.
2013-11-07 08:59:22 -08:00
Christopher Ferris
c3920dee10
am 11d04d04
: am 351b0123
: Merge "Enable libunwind on arm platforms."
...
* commit '11d04d04418503e2381cf4479a105efaf7c13992':
Enable libunwind on arm platforms.
2013-11-07 08:59:22 -08:00
Elliott Hughes
62ea993a69
Merge "Revert enabling libunwind."
2013-11-07 16:44:53 +00:00
Elliott Hughes
fde641ee24
am 30296f28
: Merge "Let external/mksh install directly into /system/bin/sh."
...
* commit '30296f2801ee692a01c3a4698f50ca01fa238fd1':
Let external/mksh install directly into /system/bin/sh.
2013-11-07 08:35:18 -08:00
Christopher Ferris
11d04d0441
am 351b0123
: Merge "Enable libunwind on arm platforms."
...
* commit '351b0123084570f8274ad3de44d515754c4b3add':
Enable libunwind on arm platforms.
2013-11-07 08:35:16 -08:00
Christopher Ferris
db2309e3d1
Revert enabling libunwind.
...
It appears that some branches might not have libunwind set up properly.
Change-Id: Ia72889e115bc2791c7a9e67563c5f4a62197cafd
2013-11-07 08:12:10 -08:00
Elliott Hughes
30296f2801
Merge "Let external/mksh install directly into /system/bin/sh."
2013-11-07 16:08:12 +00:00
Christopher Ferris
351b012308
Merge "Enable libunwind on arm platforms."
2013-11-07 15:16:11 +00:00
Rom Lemarchand
efaf929691
Merge "ion: update struct and type definitions to match kernel header"
2013-11-07 13:30:00 +00:00
Christopher Ferris
d44712a838
am aca6a4c8
: am 5e860ce2
: am d6f9be1b
: Merge "Fix include files in backtrace.h."
...
* commit 'aca6a4c8afe609439d8f5204cb273b36ac71cc85':
Fix include files in backtrace.h.
2013-11-06 17:50:01 -08:00
Christopher Ferris
aca6a4c8af
am 5e860ce2
: am d6f9be1b
: Merge "Fix include files in backtrace.h."
...
* commit '5e860ce246b9235debc6a04325c7c1983c2b277e':
Fix include files in backtrace.h.
2013-11-06 17:47:16 -08:00
Christopher Ferris
5e860ce246
am d6f9be1b
: Merge "Fix include files in backtrace.h."
...
* commit 'd6f9be1b9a2fc5880b0bcbb0fa47267a14fdc734':
Fix include files in backtrace.h.
2013-11-06 17:45:08 -08:00
Christopher Ferris
d6f9be1b9a
Merge "Fix include files in backtrace.h."
2013-11-07 01:42:48 +00:00
Christopher Ferris
e57912da92
Fix include files in backtrace.h.
...
(cherry picked from commit 0893258222
)
Change-Id: I37a78a9472b94ae84a84d871bfa9a070ff882699
2013-11-06 17:34:38 -08:00
Christopher Ferris
0893258222
Fix include files in backtrace.h.
...
Change-Id: Iaaa98b12bbf231ea43ee12f5a3f5ba0a3e4a15d6
2013-11-06 17:19:53 -08:00
Christopher Ferris
22f91cb3a1
Enable libunwind on arm platforms.
...
Bug: 8410085
Change-Id: I8a645ec0e04b38fc186bbc0f0cc597e31b05cc55
2013-11-06 15:40:23 -08:00
Christopher Ferris
9b0e074c6d
Move CallStack to libbacktrace.
...
Fix a small bug in the Printer for strings that didn't properly
prepend the prefix.
Change-Id: I33c63841ef6e07728ab3195886539d82b38ee19a
2013-11-06 12:37:14 -08:00
Rom Lemarchand
a97f22aaf1
ion: update struct and type definitions to match kernel header
...
- Replacing struct ion_handle * with ion_user_handle_t
- Replacing heap_mask field name with heap_id_mask
Change-Id: Iaba1ccc62b9398a7b37c5a734bc21a9ecbbc8277
2013-11-06 08:29:02 -08:00
Christopher Ferris
62a70df064
am dee1842d
: am adbb3352
: am a2d1469c
: Merge "Use new defines in test code."
...
* commit 'dee1842d2f6861dd4cb2d622992ec2c75f19ab3e':
Use new defines in test code.
2013-11-05 14:22:25 -08:00
Christopher Ferris
0186edee58
am 2e47c8ac
: am 1e1bae1b
: am c2945850
: Merge "Add some clarifying defines."
...
* commit '2e47c8ac74e070d62cfb46355c7c04797657c594':
Add some clarifying defines.
2013-11-05 14:22:20 -08:00
Elliott Hughes
9ef363ea7b
am f6e11efd
: am f4b3b73e
: am c8626ba4
: Merge "Dispose of ash."
...
* commit 'f6e11efd073741044fbcfe84347f1b21a551d3bf':
Dispose of ash.
2013-11-05 13:00:47 -08:00
Christopher Ferris
d709ad3da0
am 4ddea7f4
: am d5a7c371
: am 408b3acf
: Merge "Add corkscrew support for finding static symbols."
...
* commit '4ddea7f44c6362e7c34939302729e4508aa665c5':
Add corkscrew support for finding static symbols.
2013-11-05 13:00:47 -08:00
Christopher Ferris
dee1842d2f
am adbb3352
: am a2d1469c
: Merge "Use new defines in test code."
...
* commit 'adbb3352e9ce98e2012fa136198daa8342bdac00':
Use new defines in test code.
2013-11-05 12:19:00 -08:00
Christopher Ferris
adbb3352e9
am a2d1469c
: Merge "Use new defines in test code."
...
* commit 'a2d1469c773d809261d830d2f3cb3f6a7b6cdade':
Use new defines in test code.
2013-11-05 12:17:10 -08:00
Christopher Ferris
a2d1469c77
Merge "Use new defines in test code."
2013-11-05 20:15:29 +00:00
Christopher Ferris
7f081ec079
Use new defines in test code.
...
In addition, fix up the warnings and remove the -fpermissive when
compiling.
Change-Id: Ia27b902499b34ff3d881acb9057120af390baf2c
2013-11-05 12:13:05 -08:00
Christopher Ferris
2e47c8ac74
am 1e1bae1b
: am c2945850
: Merge "Add some clarifying defines."
...
* commit '1e1bae1b0fc750f60ef9a2531850bbcf27ba6610':
Add some clarifying defines.
2013-11-05 11:48:55 -08:00
Christopher Ferris
1e1bae1b0f
am c2945850
: Merge "Add some clarifying defines."
...
* commit 'c2945850e58f4ef50f3e3534ce50306262375d37':
Add some clarifying defines.
2013-11-05 11:44:33 -08:00
Christopher Ferris
c2945850e5
Merge "Add some clarifying defines."
2013-11-05 19:29:36 +00:00
Elliott Hughes
09b3598761
Let external/mksh install directly into /system/bin/sh.
...
Change-Id: I3ac60af2b5c6bba98c33cb63952eb4d35676d73f
2013-11-05 11:12:56 -08:00
Christopher Ferris
cbfc7302fb
Add some clarifying defines.
...
In order to be explicit in the Backtrace::Create() calls, adding a couple
of defines and some comments to describe what they mean.
Change-Id: I6ad08c529791821496a95fa33cea1c95b0a7eada
2013-11-05 11:05:32 -08:00
Elliott Hughes
f6e11efd07
am f4b3b73e
: am c8626ba4
: Merge "Dispose of ash."
...
* commit 'f4b3b73e95422afe79d5c5e7d28b0fcdfeaa7e88':
Dispose of ash.
2013-11-05 10:31:46 -08:00
Christopher Ferris
4ddea7f44c
am d5a7c371
: am 408b3acf
: Merge "Add corkscrew support for finding static symbols."
...
* commit 'd5a7c371d22ea327be03bfa10944e5f0f2d51a24':
Add corkscrew support for finding static symbols.
2013-11-05 10:31:45 -08:00