Commit Graph

8335 Commits

Author SHA1 Message Date
Elliott Hughes a59b6ac697 Merge "Only the Mac doesn't have open_memstream." 2014-08-21 00:11:41 +00:00
Elliott Hughes 3ff8888f66 Only the Mac doesn't have open_memstream.
We should probably move this into art, since they're the only people using it.

Bug: 17164505
Change-Id: I67b8f0cbad4c6368d4424e6979d6b044dd36aa37
2014-08-20 16:16:24 -07:00
Elliott Hughes 373c77583f Merge "There's no non-SMP LP64." 2014-08-20 12:21:52 +00:00
Elliott Hughes 901c900ce6 There's no non-SMP LP64.
Bug: 17108682
Change-Id: I7e44ab48b5cacf989333882ffe67f39e9b0ce843
2014-08-20 13:05:55 -07:00
Dan Albert afc9bc01b4 Merge "Update for public android_set_abort_message()." 2014-08-16 04:03:35 +00:00
Dan Albert 4047075da6 Update for public android_set_abort_message().
Since android_set_abort_message() is quite helpful to the platform, it's
becoming promoted to a real header with a non-private name.

Bug: 17059126
Change-Id: I3ed12b66eb07f3a6a08366d5eee147809d9a3ce9
2014-08-18 17:29:34 -07:00
Piotr Jastrzebski 8fd1f27ed8 Merge "Reject zip archives with entry names containing \0." 2014-08-16 05:59:09 +00:00
Piotr Jastrzebski 78271ba97b Reject zip archives with entry names containing \0.
There should never be a need of an entry name with \0 character.

Bug: 16162465
Change-Id: Ia2ec57959280c1bb972c4d59d890c8540c5b9081
2014-08-19 11:02:58 +01:00
Piotr Jastrzebski 3e13ed0864 Merge "Cleanup ziparchive" 2014-08-16 04:31:31 +00:00
Piotr Jastrzebski 10aa9a0e24 Cleanup ziparchive
Addressed review comments from 8e08536108

Change-Id: If576e2d6cc5ad330a7dee66b09663e0c04ea3801
2014-08-19 10:58:03 +01:00
Elliott Hughes 7fb0ee0c4d Merge "Remove androidGetTid." 2014-08-16 04:08:14 +00:00
Elliott Hughes b7659613b2 Remove androidGetTid.
Bug: 17048545
Change-Id: I93cbb2d7bd18d506b5f5f7f262dd9ac0fca053b4
2014-08-18 10:47:37 -07:00
Piotr Jastrzebski 5f231a43b3 Merge "Fix win_sdk build by not using vector" 2014-08-16 04:55:08 +00:00
Piotr Jastrzebski 8e08536108 Fix win_sdk build by not using vector
Change-Id: I4e9ee4286ea29e1f5f2ee477525e79bfa16ad9a0
2014-08-18 14:04:56 +01:00
Calin Juravle 55494fb32d Merge "Switch libnativebridge to clang" 2014-08-16 04:31:31 +00:00
Calin Juravle db2127b662 Switch libnativebridge to clang
This fixes the mac build.

(cherry picked from commit 935708be6f)

Change-Id: I246a1c0af2124ed1cec653f2f44ca256f26534ff
2014-08-18 11:05:26 +01:00
Piotr Jastrzebski c0879ee9d3 Merge "Replace char* with ZipEntryName in ziparchive API." 2014-08-16 04:31:31 +00:00
Colin Cross 39ab11d0d4 Merge "fastboot: add the support of the second stage image" 2014-08-16 04:08:14 +00:00
Piotr Jastrzebski ecccc5ad93 Replace char* with ZipEntryName in ziparchive API.
It's important because entry names can be encoded in UTF-8 and can have \0
character in the middle.
Use vector instead of char* for prefix in IterationHandle.

Bug: 16162465
Change-Id: Ie34c8d7c6231cc258530c22bdde5542895213649
2014-08-15 12:39:45 +01:00
Calin Juravle 25a7d5f892 Merge "Move native bridge library in system/core" 2014-08-15 04:45:59 +00:00
Calin Juravle 961ae12dea Move native bridge library in system/core
Bug: 16884833

Change-Id: I73aab8e212860ba5aee9444d801806d3da326a41
2014-08-12 22:39:25 +01:00
Ying Wang e1ba39aa66 Merge "Fix 64-bit host build." 2014-08-12 19:23:43 +00:00
Ying Wang 42a809ba06 Fix 64-bit host build.
Bug: 13751317
Change-Id: Ibf62935b7d12a55ffc57242a26a2581b52796847
2014-08-14 15:52:54 -07:00
Piotr Jastrzebski b242ad40b1 Merge "Revert "Make sure that names of all entries have the same encoding."" 2014-08-12 20:07:20 +00:00
Piotr Jastrzebski bd0a74854e Revert "Make sure that names of all entries have the same encoding."
This reverts commit 6a7f4bb79d.

Change-Id: Id4f5b601ff0b9d82ce2c9beeb9162eba9594b3a7
2014-08-13 09:49:25 +00:00
Piotr Jastrzebski 6a7f4bb79d Make sure that names of all entries have the same encoding.
Add new public method to allow checkisc if an archive has entry names encoded in
UTF-8. If not then they will be encoded in IBM PC character encoding.

Bug: 16162465
Change-Id: I4468d76accca8a9b0b31cae8d43399ffc22cad42
2014-08-13 09:58:16 +01:00
Piotr Jastrzebski b020676566 Merge "Make sure that names of all entries have the same encoding." 2014-08-12 19:57:35 +00:00
Badhri Jagan Sridharan e4c5b6143b Merge "libusbhost: Fix IOCTL call during usb_request_cancel" 2014-08-12 19:32:26 +00:00
Mark Salyzyn d8ab8fc71c Merge "logd: persistent reader threads" 2014-08-12 16:54:49 +00:00
Mark Salyzyn a16f761faa logd: persistent reader threads
(cherry picked from commit c113c5813e)

Bug: 16822776
Change-Id: I5bea468a41089b51108880044f32e2b2df1278e7
2014-08-12 18:59:35 +00:00
Piotr Jastrzebski 8750fa7609 Merge "Make a copy of a prefix param in StartIteration" 2014-08-08 20:41:34 +00:00
Piotr Jastrzebski 34e03bdfdf Make a copy of a prefix param in StartIteration
and delete it in EndIteration.

Change-Id: I4de4167700a9dba3119fde22fcd45725742f3731
2014-08-11 14:20:24 +01:00
Badhri Jagan Sridharan ef4087bf2b libusbhost: Fix IOCTL call during usb_request_cancel
USBDEVFS_DISCARDURB IOCTL call expects a pointer to the
the urb structure to be passed from userspace. LibusbHost
instead sends usbdevfs_urb**. Change this to usbdevfs_urb*.

Fixes Issue: https://code.google.com/p/android/issues/detail?id=74530

Change-Id: Ifb8a13857e1a9f62536f2a07c0965e9c419b7d4c
2014-08-07 14:58:31 -07:00
Piotr Jastrzebski 400e73720c Merge "Add EndIteration method to free memory allocated" 2014-08-07 18:51:06 +00:00
Piotr Jastrzebski 79c8b34f36 Add EndIteration method to free memory allocated
in StartIteration. This method should always be called when the
iteration is over to make sure that we don't leak memory.

Change-Id: I5205c754dfafbab9bb5f06003c3663d2ec4e8a35
2014-08-11 07:58:00 +01:00
Dmitriy Ivanov 2f40ddf3f3 Merge "Do not suppress maps dump when si_addr<PAGE_SIZE" 2014-08-09 00:45:41 +00:00
Dmitriy Ivanov f10aa3ae9d Do not suppress maps dump when si_addr<PAGE_SIZE
Also remove alignment of si_addr.

Change-Id: Ie5445bf8a5baa49e04e37c643c25ebd0f1dc9d22
2014-08-09 12:07:51 -07:00
Jeremy Compostella ecd28eff0a fastboot: add the support of the second stage image
The AOSP bootimage format allows the use of a second stage image
however the fastboot boot and flash:row commands do not allow the
"secondstage" optional argument.  This patch adds the support of this
argument for both commands.

Change-Id: I00403a95d7460a00233841ba0fe0e8a69d78c7b4
Signed-off-by: Jeremy Compostella <jeremy.compostella@intel.com>
2014-08-06 12:27:01 +02:00
Elliott Hughes a8d0c4a2b8 Merge "Move host 'get-state' service up so that it works." 2014-08-05 00:30:25 +00:00
Elliott Hughes 93266ed1f7 Merge changes I2998e40a,I03eacfa1
* changes:
  Partially revert argument escaping.
  Uniformly escape shell arguments.
2014-08-05 00:35:38 +00:00
Jeff Sharkey 0cc642c82d Partially revert argument escaping.
Commands chained with && need to be passed through literally instead
of always being quoted.

(cherry-pick of 7c460351f53cb683097fe4071b9ec1e4cd7cdf82.)

Bug: 15479704
Change-Id: I2998e40a92a3bfd092098cd526403b469c86c9a6
2014-08-05 22:55:39 +00:00
Jeff Sharkey dcd2f0ef2f Uniformly escape shell arguments.
Arguments with embedded spaces need to be wrapped in quotes, which
changes the overall escaping strategy.  Instead of mixing the two
strategies, just always wrap arguments in quotes.

(cherry-pick of fd546e8c35341b518873eb4f883afbed92e947af.)

Bug: 15479704
Change-Id: I03eacfa1bd6c220d4ec6617b825ebb0c43c7221e
2014-08-05 22:54:35 +00:00
Elliott Hughes 6d9a5ac394 Merge "[MIPSR6] Skip pixelflinger, memset assembler code on mips32r6" 2014-08-05 17:41:26 +00:00
Brian Carlstrom 936a236b9e Merge "Add uncached argument to BacktraceMap::Create on darwin" 2014-08-05 00:42:16 +00:00
Brian Carlstrom b978a329ef Add uncached argument to BacktraceMap::Create on darwin
Change-Id: I247a98fc3b98879a0c34a975f9914ccec95d1a04
2014-08-05 00:15:49 -07:00
Christopher Ferris 1f5af3c26c Merge "Allow getting an uncached process map." 2014-08-05 00:35:38 +00:00
Christopher Ferris dda47b7868 Allow getting an uncached process map.
(cherry picked from commit f02593b0e6)

Change-Id: I2012bf2dc553ebc663345b9eac6d794e80df9c00
2014-08-04 19:21:23 -07:00
Elliott Hughes 56b28f6b2c Merge "RefBase: make Renamer destructor virtual" 2014-08-05 00:30:25 +00:00
Elliott Hughes d24240fb4f Merge "Fixed the pacing logic in bootchart data collection." 2014-08-06 17:15:22 +00:00
Ukri Niemimuukko 00e56a248d RefBase: make Renamer destructor virtual
This patch makes the Renamer class destructor virtual and fixes
the incorrect constructor initialization list ordering.

These issues and related compiler warnings have been suppressed
by the build system which uses the gcc –isystem command
line option, unless a project explicitly adds the include the path
system/core/include to Android.mk and uses the templates.

Change-Id: Iff76a655eb8bd547adfe994c7315a005e98aed41
Signed-off-by: Ukri Niemimuukko <ukri.niemimuukko@intel.com>
Signed-off-by: Mingwei Shi <mingwei.shi@intel.com>
Signed-off-by: Yong Yao <yong.yao@intel.com>
2014-08-06 00:12:06 -07:00