Commit graph

5713 commits

Author SHA1 Message Date
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
4ae94541b8 am 62ea993a: Merge "Revert enabling libunwind."
* commit '62ea993a6997701dba7735ca4a4af6fc6cabac2c':
  Revert enabling libunwind.
2013-11-07 09:01:20 -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
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
22f91cb3a1 Enable libunwind on arm platforms.
Bug: 8410085
Change-Id: I8a645ec0e04b38fc186bbc0f0cc597e31b05cc55
2013-11-06 15:40:23 -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
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
f4b3b73e95 am c8626ba4: Merge "Dispose of ash."
* commit 'c8626ba480c0e2cab4f4d2fe43bd8f741320b404':
  Dispose of ash.
2013-11-05 10:30:02 -08:00
Christopher Ferris
d5a7c371d2 am 408b3acf: Merge "Add corkscrew support for finding static symbols."
* commit '408b3acf5e0b0d353cf8b64598f285141d1a0116':
  Add corkscrew support for finding static symbols.
2013-11-05 10:29:46 -08:00
Elliott Hughes
c8626ba480 Merge "Dispose of ash." 2013-11-05 18:00:27 +00:00
Elliott Hughes
f6e21e06e3 Dispose of ash.
We haven't used ash for several releases. Remove ash and its
companion liblinenoise.

I've left the support for an alternative shell here for now,
but we can move that out to external/mksh later if we want.
(For now this seemed like a somewhat useful signpost to the real shell.)

Change-Id: I634c7969f6cbe375a2bc56fc1077e64888380f3d
2013-11-05 09:44:57 -08:00
Christopher Ferris
408b3acf5e Merge "Add corkscrew support for finding static symbols." 2013-11-04 23:19:53 +00:00
Christopher Ferris
923b536920 Add corkscrew support for finding static symbols.
Change-Id: Ie557a9b0efadece75e1accaa7e214fb559eb19e1
2013-11-04 14:50:36 -08:00
Christopher Ferris
b5c24e096d am 8c58086c: Merge "More libbacktrace fixes."
* commit '8c58086c54a23d33e915852a1355a171b09679cc':
  More libbacktrace fixes.
2013-10-30 14:29:51 -07:00
Christopher Ferris
8c58086c54 Merge "More libbacktrace fixes." 2013-10-30 21:28:22 +00:00
Christopher Ferris
8ed46278be More libbacktrace fixes.
Included in minor fix ups is the addition of a warning macro to replace
all of the ALOGW calls.

Fix a race where multiple threads could be attempting to unwind the threads
of the current process at the same time.

Bug: 8410085

Change-Id: I02a65dc778dde690e5f95fc8ff069a32d0832fd1
2013-10-30 14:14:54 -07:00
Elliott Hughes
f17f55914e am 36d44740: Merge "Fix a bunch of small system/core bugs."
* commit '36d44740dd045403ae615b8dd6dac8b9a4e9f5bf':
  Fix a bunch of small system/core bugs.
2013-10-29 14:29:26 -07:00
Elliott Hughes
36d44740dd Merge "Fix a bunch of small system/core bugs." 2013-10-29 21:26:55 +00:00
Elliott Hughes
14e28d39f7 Fix a bunch of small system/core bugs.
Missing frees in:
  adb/file_sync_client.c
  fastboot/fastboot.c
  libsparse/output_file.c

Missing closedirs in:
  adb/file_sync_service.c
  cpio/mkbootfs.c
  libcutils/dir_hash.c

Potential buffer overrun in:
  gpttool/gpttool.c

Incorrect NULL check in:
  libsparse/backed_block.c

Bug: https://code.google.com/p/android/issues/detail?id=61564
Change-Id: If97838a9e73a77aef7f416c31c237ce1fca4ce21
2013-10-29 14:12:46 -07:00
Christopher Ferris
0f26808e2c am 98f87d92: Merge "Rewrite libbacktrace using C++."
* commit '98f87d92d89079f274374409efcf57ca52b13c1f':
  Rewrite libbacktrace using C++.
2013-10-29 13:25:06 -07:00
Christopher Ferris
98f87d92d8 Merge "Rewrite libbacktrace using C++." 2013-10-29 20:21:58 +00:00
Christopher Ferris
17e91d44ed Rewrite libbacktrace using C++.
The old code was essentially trying to be C++ in C and was awkward. This
change makes it all objects with a thin layer that C code can use.

There is a C++ backtrace object that is not very useful, this code will
replace it.

This change also includes moving the backtrace test to a gtest, and adding
coverage of all major functionality.

Bug: 8410085
Change-Id: Iae0f1b09b3dd60395f71ed66010c1ea5cdd37841
2013-10-28 17:55:25 -07:00
Brian Carlstrom
5dadac50c4 am 87af04a4: Merge "Improve some adb error logging"
* commit '87af04a42ec2d959cced0f1c01888f9cf3b2b9c5':
  Improve some adb error logging
2013-10-28 14:27:33 -07:00
Brian Carlstrom
87af04a42e Merge "Improve some adb error logging" 2013-10-28 21:24:51 +00:00
Brian Carlstrom
93c91fad77 Improve some adb error logging
Bug: 11290643
Change-Id: Ibad4e9f0b69421cd6017b70a52237e7f27aab848
2013-10-27 16:56:55 -07:00
Elliott Hughes
c3d04aab96 am 4d87e743: Merge "Eliminate text relocations in x86 optimized memset versions"
* commit '4d87e743083c201edd0b565dd7d42e70945a6265':
  Eliminate text relocations in x86 optimized memset versions
2013-10-24 12:33:40 -07:00
Elliott Hughes
4d87e74308 Merge "Eliminate text relocations in x86 optimized memset versions" 2013-10-24 18:17:21 +00:00
Pavel Chupin
9ff8767bc6 Eliminate text relocations in x86 optimized memset versions
Change-Id: Ieb72af8cf7f93210a68a87b1e2538deb5642f4d5
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
2013-10-24 21:42:30 +04:00
Elliott Hughes
9ff588f84b am f1296b9e: Merge "Use %zd for size_t."
* commit 'f1296b9e92cb04f9bba8c622560d37dfc53c7aa4':
  Use %zd for size_t.
2013-10-18 17:40:26 -07:00
Elliott Hughes
f1296b9e92 Merge "Use %zd for size_t." 2013-10-19 00:38:07 +00:00
Elliott Hughes
9640b30dd7 Use %zd for size_t.
Change-Id: I0139243c309e85236eb00bb471736bdd99eeec84
2013-10-18 17:11:00 -07:00
JP Abgrall
9c39c96a52 am b387a7f2: Merge "Wait for device to disappear after reboot-bootloader."
* commit 'b387a7f2168a720fa486f31e8f3189114f69c0db':
  Wait for device to disappear after reboot-bootloader.
2013-10-17 13:09:56 -07:00
JP Abgrall
b387a7f216 Merge "Wait for device to disappear after reboot-bootloader." 2013-10-17 20:07:05 +00:00
Mark Wachsler
157b00171a Wait for device to disappear after reboot-bootloader.
(Linux only for now) With fastboot reading serial numbers from sysfs, it had
become possible for a fastboot command issued immediately after rebooting
the bootloader to fail, because sysfs still thought the device was online.
To prevent this, after reboot-bootloader we wait for the device to disconnect.

Also made usb_read and usb_write fail immediately if the descriptor has been
closed; this prevents an incorrect error message ("Bad file descriptor")
when errors from fb_getvar are ignored (e.g., by fb_format_supported).

Also removed unused fd param from filter_usb_device, and simplified logic
in usb_write by using do/while instead of a special case for len == 0.

Change-Id: I799b857eab411fd8ad25f5777fc61c685152ea86
2013-10-17 20:06:32 +00:00
JP Abgrall
95e69261b2 am ac568b8f: Merge "init: remove obsolete rle logo"
* commit 'ac568b8f783ee60a7a2cb0ab5b6db786bdb39b35':
  init: remove obsolete rle logo
2013-10-17 09:44:35 -07:00
JP Abgrall
ac568b8f78 Merge "init: remove obsolete rle logo" 2013-10-17 16:42:15 +00:00