Kenny Root
207c17ff1f
Merge "Make adb robust against EINTR"
2012-10-12 23:45:47 -07:00
Kenny Root
73167412bc
Make adb robust against EINTR
...
Change-Id: I39a8d9007ce2d5662a33a50e4d7e2e7f8f9fad63
2012-10-12 15:28:37 -07:00
Kenny Root
674c0445e2
Merge "toolbox: silence some compiler warnings"
2012-10-11 00:03:53 -07:00
Kenny Root
ef5d0340e4
toolbox: silence some compiler warnings
...
Comparison of signed and unsigned integers. Use parenthesis around a
group of bitwise OR operations.
Change-Id: Ia404380593ce2c2a291133c07c0fc7a016a3ad3f
2012-10-10 11:28:27 -07:00
Nick Kralevich
33045b3d7b
am f9c05970: Merge "init: harden property service."
...
* commit 'f9c059700ce91dfca05d44ec67938209a69bbd39':
init: harden property service.
2012-10-04 11:45:17 -07:00
Nick Kralevich
f9c059700c
Merge "init: harden property service."
2012-10-04 11:01:06 -07:00
Nick Kralevich
7ecfe6a94b
init: harden property service.
...
Don't create temporary files in a well-known location. Rather,
use mkstemp().
Don't read persistent property files from insecure files.
Change-Id: I81e2aca674a2a7ca54869f088737fb228d3af6d2
2012-10-04 10:47:05 -07:00
Elliott Hughes
cfd7c2a051
am 1c0c5250: Merge "Rename getline to fs_getline for fs_mgr"
...
* commit '1c0c52503dcedff1a75775bf8bfffe7ec77b722b':
Rename getline to fs_getline for fs_mgr
2012-09-26 15:01:25 -07:00
Elliott Hughes
1c0c52503d
Merge "Rename getline to fs_getline for fs_mgr"
2012-09-26 13:57:55 -07:00
Elliott Hughes
e2a3fe235e
am 2dbef6ae: Merge "The localtime_tz and mktime_tz extensions are now in bionic."
...
* commit '2dbef6ae08eec8815863b89046653a1a73443a7c':
The localtime_tz and mktime_tz extensions are now in bionic.
2012-09-24 08:57:47 -07:00
Elliott Hughes
2dbef6ae08
Merge "The localtime_tz and mktime_tz extensions are now in bionic."
2012-09-24 08:41:43 -07:00
Kenny Root
b905f121c3
am 9796a83a: Merge "Add shared app gid to fs config"
...
* commit '9796a83a39e757558c07e17bd277ab2694762dfd':
Add shared app gid to fs config
2012-09-13 13:02:42 -07:00
Kenny Root
9796a83a39
Merge "Add shared app gid to fs config"
2012-09-13 12:10:54 -07:00
Kenny Root
7e41c8420e
Add shared app gid to fs config
...
This will allow native tools to be able to know where the shared app
gids start and end.
Change-Id: Ie4529baf36b361c51c42f079b259c352e316647f
2012-09-13 11:23:55 -07:00
Elliott Hughes
cb71ed3092
am 50e2555d: Merge "Always include <sys/socket.h> before <linux/netlink.h>."
...
* commit '50e2555d6c824bd3c7e664f222061158a83ac705':
Always include <sys/socket.h> before <linux/netlink.h>.
2012-09-12 11:04:47 -07:00
Elliott Hughes
50e2555d6c
Merge "Always include <sys/socket.h> before <linux/netlink.h>."
2012-09-12 10:25:15 -07:00
Elliott Hughes
b77d3d7249
Always include <sys/socket.h> before <linux/netlink.h>.
...
Newer kernel headers files aren't stand alone. (This has long been true of
glibc's copy, but we only recently updated external/kernel-headers.)
Change-Id: Iebcb40902b2f29fe509e207e2f3a9d02a7e40602
2012-09-12 10:10:20 -07:00
Irina Tirdea
295b82bd69
Rename getline to fs_getline for fs_mgr
...
fs_mgr defines its own version of getline and uses it
internally. This leads to a build error if getline is
also defined in bionic, since fs_mgr will see readline
as defined internally.
Rename getline in fs_mgr to a local name (fs_getline)
so that there will no longer be any conflicts.
This is needed it we want to add getline in bionic.
Change-Id: I3a32be71a645e122629802d98ff8f9ab9c419e86
Signed-off-by: Irina Tirdea <irina.tirdea@intel.com>
2012-09-12 19:48:51 +03:00
Elliott Hughes
d03072ffde
The localtime_tz and mktime_tz extensions are now in bionic.
...
Bug: 7012465
Change-Id: I5f3d06fe06fad7c3ff6d1950770a30f4f83e56ff
2012-09-11 11:18:38 -07:00
Colin Cross
eb7ee9c0c5
am 922b460c: Merge "fastboot: move help command before usb connect"
...
* commit '922b460cc790722ffc303b200f02958e4066a2de':
fastboot: move help command before usb connect
2012-09-10 14:43:26 -07:00
Colin Cross
922b460cc7
Merge "fastboot: move help command before usb connect"
2012-09-10 14:13:29 -07:00
Colin Cross
80f9867431
fastboot: move help command before usb connect
...
Move the help command handling before the call to open_device
so that is doesn't block when no device is connected.
Bug: 7078873
Change-Id: I4e9a4317bd72b4ceb4b9fc838eafd2e57b17a473
2012-09-10 14:12:37 -07:00
Ian Rogers
0991797fd6
am 82959f5e: Merge "Remove unnecessary compiler pragma."
...
* commit '82959f5e46870cb57675d1ebba97294c56508949':
Remove unnecessary compiler pragma.
2012-09-07 19:59:33 -07:00
Ian Rogers
82959f5e46
Merge "Remove unnecessary compiler pragma."
2012-09-07 19:28:54 -07:00
Ian Rogers
04b5ac36a5
Remove unnecessary compiler pragma.
...
With dlmalloc 2.8.6 the compiler pragmas to suppress warnings are not
necessary.
Also fix compiler warning about redefinition of LOG_TAG.
Depends upon: https://android-review.googlesource.com/42351
Change-Id: I50f70be31f4bd994b09083e722759464476c70b3
2012-08-29 18:13:14 -07:00
Wink Saville
e3524293da
am af03b050: Merge "Export flags needed for ifc_reset_connections API in netutils"
...
* commit 'af03b05009863f5d9761864dcec13e4ee6221d69':
Export flags needed for ifc_reset_connections API in netutils
2012-08-28 19:50:20 -07:00
Wink Saville
af03b05009
Merge "Export flags needed for ifc_reset_connections API in netutils"
2012-08-28 19:43:27 -07:00
Jean-Baptiste Queru
7995b84148
am c3c5358b: Merge "Add MIPS support to pixelflinger."
...
* commit 'c3c5358b94f48799fd595c829ce223b43588bac1':
Add MIPS support to pixelflinger.
2012-08-27 15:15:24 -07:00
Jean-Baptiste Queru
c3c5358b94
Merge "Add MIPS support to pixelflinger."
2012-08-27 14:22:22 -07:00
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