Wink Saville
582b11527c
am baba9984: Merge "Define TCP buffer sizes for HSPAP, HSDPA, HSUPA and EVDO"
...
* commit 'baba99840400f5b835d44b6d91e2190136277988':
Define TCP buffer sizes for HSPAP, HSDPA, HSUPA and EVDO
2012-08-22 15:32:17 -07:00
Wink Saville
baba998404
Merge "Define TCP buffer sizes for HSPAP, HSDPA, HSUPA and EVDO"
2012-08-22 15:00:00 -07:00
Jean-Baptiste Queru
a6405e9da2
am db56bb4a: Merge "libcorkscrew: avoid future name collisions."
...
* commit 'db56bb4aebb2aaa63cf33c2f9868a22ea655b38e':
libcorkscrew: avoid future name collisions.
2012-08-22 11:02:42 -07:00
Jean-Baptiste Queru
db56bb4aeb
Merge "libcorkscrew: avoid future name collisions."
2012-08-22 10:43:11 -07:00
Jean-Baptiste Queru
487d6d3db3
am 02fd2924: Merge "Fixed warnings test_zipfile"
...
* commit '02fd29246ab54ee4a0f8fa6358498070e54e5fd0':
Fixed warnings test_zipfile
2012-08-21 09:10:03 -07:00
Jean-Baptiste Queru
00f0691107
am c6620cb3: Merge "Fixing unused param warnings in sync_test"
...
* commit 'c6620cb3a37e98ceb89f5d11305038786af76650':
Fixing unused param warnings in sync_test
2012-08-21 09:10:02 -07:00
Jean-Baptiste Queru
02fd29246a
Merge "Fixed warnings test_zipfile"
2012-08-21 08:09:07 -07:00
Jean-Baptiste Queru
c6620cb3a3
Merge "Fixing unused param warnings in sync_test"
2012-08-21 08:08:55 -07:00
Brian Carlstrom
e05ac5415e
am 9d779bf1: Merge "Upgrade to dlmalloc 2.8.5."
...
* commit '9d779bf1ea587dc70b74fd1f8798894a8695e78b':
Upgrade to dlmalloc 2.8.5.
2012-08-20 17:02:20 -07:00
Brian Carlstrom
9d779bf1ea
Merge "Upgrade to dlmalloc 2.8.5."
2012-08-20 16:12:35 -07:00
Ian Rogers
2d13791ce7
Upgrade to dlmalloc 2.8.5.
...
Remove mspace functionality from cutils.
Directly declare mspace from dlmalloc in code flinger's code cache, and
manage without using morecore.
Depends upon: https://android-review.googlesource.com/41717
Change-Id: If927254febd4414212c690f16509ef2ee1b44b44
2012-08-20 15:30:35 -07:00
Jean-Baptiste Queru
42900c30cf
am 0874aa0e: Merge "adb: Pick desired product value from command line it follows -p"
...
* commit '0874aa0ec4f413a77a610133c904c2590a2e3ccd':
adb: Pick desired product value from command line it follows -p
2012-08-20 14:50:36 -07:00
Jean-Baptiste Queru
7608092541
am 52d5dfc8: Merge "vmstat: Fix -n flag"
...
* commit '52d5dfc8d30890734ee7122c3139f8637e196a1c':
vmstat: Fix -n flag
2012-08-20 14:50:35 -07:00
Jean-Baptiste Queru
1bcced2bb6
am c57689fc: Merge "add command-line arguments to mkbootimg to move kernel, ramdisk, etc."
...
* commit 'c57689fc7ccadee4f852ad62ac1010e53382a67c':
add command-line arguments to mkbootimg to move kernel, ramdisk, etc.
2012-08-20 14:50:34 -07:00
Jean-Baptiste Queru
0874aa0ec4
Merge "adb: Pick desired product value from command line it follows -p"
2012-08-20 14:41:25 -07:00
Jean-Baptiste Queru
52d5dfc8d3
Merge "vmstat: Fix -n flag"
2012-08-20 14:25:13 -07:00
Jean-Baptiste Queru
c57689fc7c
Merge "add command-line arguments to mkbootimg to move kernel, ramdisk, etc."
2012-08-20 14:24:56 -07:00
Ariel Bernal
62188564fa
Fixed warnings test_zipfile
...
Fixed implicit declaration of strcmp warning
Fixed switch case of enumeration not handled
Change-Id: Ic3f3690a2e749235b1b0dffd252b119855ad36c0
Author: Ariel Bernal <ariel.j.bernal@intel.com>
Reviewed-by: Tareq A Siraj <tareq.a.siraj@intel.com>
2012-08-20 16:38:37 -04:00
Doug Zongker
ed95159056
add command-line arguments to mkbootimg to move kernel, ramdisk, etc.
...
Bug: 6918260
Change-Id: I5d4af6314fded027952941110a520dc9aa234a14
2012-08-20 10:46:10 -07:00
Jean-Baptiste Queru
94938c9d60
am ed2e672f: Merge "Print strerror for file read errors during flashing"
...
* commit 'ed2e672f3b929ac49617de11e6530c812b082eb6':
Print strerror for file read errors during flashing
2012-08-20 09:41:54 -07:00
Jean-Baptiste Queru
3af04b71e5
am 7c386a61: Merge "Extend and document the "wait" command"
...
* commit '7c386a610d9164c12932452d1ff671e070956ec1':
Extend and document the "wait" command
2012-08-20 09:41:53 -07:00
Jean-Baptiste Queru
cd82a6fea0
am 36b1399d: Merge "diskconfig: Add missing include for loff_t"
...
* commit '36b1399d8cee09d4ffde3bf958322ab9556b8ebe':
diskconfig: Add missing include for loff_t
2012-08-20 09:41:52 -07:00
Jean-Baptiste Queru
ed2e672f3b
Merge "Print strerror for file read errors during flashing"
2012-08-20 09:19:09 -07:00
Jean-Baptiste Queru
7c386a610d
Merge "Extend and document the "wait" command"
2012-08-20 09:18:38 -07:00
Jean-Baptiste Queru
36b1399d8c
Merge "diskconfig: Add missing include for loff_t"
2012-08-20 09:18:06 -07:00
Joe Onorato
c56f428530
am a11f4bcf: Merge changes I5006b467,I0118cebf,Ibc792367
...
* commit 'a11f4bcfd4d40673bc97d81eb80e201359ade1e6':
Support for multiple modules with the same name is going away.
Fix build by removing TAGS from host module
libext4_utils on host is now called libext4_utils_host so there is no name conflict
2012-08-17 00:51:12 -07:00
Joe Onorato
a11f4bcfd4
Merge changes I5006b467,I0118cebf,Ibc792367
...
* changes:
Support for multiple modules with the same name is going away.
Fix build by removing TAGS from host module
libext4_utils on host is now called libext4_utils_host so there is no name conflict
2012-08-17 00:38:58 -07:00
Joe Onorato
5069b01e21
Support for multiple modules with the same name is going away.
...
Change-Id: I5006b467978071f9107babe532efa71d05061580
2012-08-15 19:52:52 -07:00
Mike J. Chen
1926c15a12
Fix build by removing TAGS from host module
...
Change-Id: I0118cebff021b435baea0b46dd3c43250ef96632
Signed-off-by: Mike J. Chen <mjchen@google.com>
2012-08-15 19:52:52 -07:00
Joe Onorato
2ffe3c8ac4
libext4_utils on host is now called libext4_utils_host so there is no name conflict
...
Change-Id: Ibc7923676925ed6942b3f672ee764cfaa98ee96e
2012-08-15 19:52:52 -07:00
Jean-Baptiste Queru
2237ca4c66
am 2290dd41: Merge "Fixing signed/unsigned comparison warnings"
...
* commit '2290dd418b4ddcb12027fa4616affe64eb92ad1e':
Fixing signed/unsigned comparison warnings
2012-08-15 09:31:25 -07:00
Jean-Baptiste Queru
e3bdaeb603
am 2765e4fb: Merge "Use sigemptyset to initialise signal mask as it is more portable. Referencing sa_restorer fails on MIPS"
...
* commit '2765e4fb39af2f8260de1177027e292f2a7198bd':
Use sigemptyset to initialise signal mask as it is more portable. Referencing sa_restorer fails on MIPS
2012-08-15 09:31:24 -07:00
Jean-Baptiste Queru
417e3041b8
am 8124e073: Merge "Fix unused parameter warnings"
...
* commit '8124e0736208c47a74767170d31e3c24e0f47504':
Fix unused parameter warnings
2012-08-15 09:31:23 -07:00
Jean-Baptiste Queru
83c4398b4a
am cc12ed32: Merge "[MIPS] debuggerd and libcorkscrew support"
...
* commit 'cc12ed3241a4081970cdd70f88d57cb4d3bc19f2':
[MIPS] debuggerd and libcorkscrew support
2012-08-15 09:31:21 -07:00
Jean-Baptiste Queru
2290dd418b
Merge "Fixing signed/unsigned comparison warnings"
2012-08-15 09:15:22 -07:00
Jean-Baptiste Queru
2765e4fb39
Merge "Use sigemptyset to initialise signal mask as it is more portable. Referencing sa_restorer fails on MIPS"
2012-08-15 08:52:09 -07:00
Jean-Baptiste Queru
8124e07362
Merge "Fix unused parameter warnings"
2012-08-15 08:45:48 -07:00
Jean-Baptiste Queru
cc12ed3241
Merge "[MIPS] debuggerd and libcorkscrew support"
2012-08-15 08:44:59 -07:00
Keun-young Park
8f19b11a42
am c4c731e7: Merge "[MIPS] Enable SD-card functionality to work"
...
* commit 'c4c731e78ca1a3527093a35280381616d1cb667d':
[MIPS] Enable SD-card functionality to work
2012-08-14 18:27:25 -07:00
Keun-young Park
c4c731e78c
Merge "[MIPS] Enable SD-card functionality to work"
2012-08-14 17:30:07 -07:00
Chris Dearman
6736eb1829
Use sigemptyset to initialise signal mask as it is more portable.
...
Referencing sa_restorer fails on MIPS
Change-Id: I81c9ed5ef027a9d5258942ffcecb96e3f787e93c
Signed-off-by: Chris Dearman <chris@mips.com>
2012-08-14 15:30:39 -07:00
Edwin Vane
29bdc876e4
Fixing signed/unsigned comparison warnings
...
Clang turned up some signed/unsigned comparison warnings. These warnings
have been fixed by cleaning up sdcard slightly:
- Don't use negative numbers for invalid gid/uid.
- sdcard takes a fixed number of arguments now so assert on that instead
of using a for loop.
- Also fixed usage string to reflect this fact.
Change-Id: Iee58a8e9aaedb3d40ad7dfeef63d8cd1fe1cd248
Author: Edwin Vane <edwin.vane@intel.com>
Reviewed-by: Kevin P Schoedel <kevin.p.schoedel@intel.com>
2012-08-14 13:16:55 -04:00
Jean-Baptiste Queru
ee0d281a3e
am c95c15b1: Merge "Char device /dev/dri/card0 was not created during startup."
...
* commit 'c95c15b1923611f48c44c18ad158e57b9d915fdf':
Char device /dev/dri/card0 was not created during startup.
2012-08-14 08:39:22 -07:00
Jean-Baptiste Queru
c95c15b192
Merge "Char device /dev/dri/card0 was not created during startup."
2012-08-14 08:06:44 -07:00
Jean-Baptiste Queru
e8e73b0139
am 311a4758: Merge "Remove system/core\'s remnants of SH support."
...
* commit '311a47585cb14984d2169c7e8f59949cec30fd85':
Remove system/core's remnants of SH support.
2012-08-13 15:19:12 -07:00
Jean-Baptiste Queru
311a47585c
Merge "Remove system/core's remnants of SH support."
2012-08-13 14:48:33 -07:00
Kenny Root
02e9f8d5aa
am 53dab583: Merge "Make setenforce usage function static."
...
* commit '53dab583c448ae97c3472c06609c2c31d6549c07':
Make setenforce usage function static.
2012-08-13 14:12:34 -07:00
Kenny Root
53dab583c4
Merge "Make setenforce usage function static."
2012-08-13 13:36:17 -07:00
Stephen Hines
753b96cf67
am dd56039c: Merge "Fixed an unused param warning in logcat"
...
* commit 'dd56039c881db2efebfa7df6491579e3ae01748f':
Fixed an unused param warning in logcat
2012-08-13 13:06:29 -07:00
Matt Finifter
492051ed2a
Make setenforce usage function static.
...
Change-Id: I6de204dc072418805160a35d799b8948ecb39251
2012-08-13 12:56:23 -07:00