Android Git Automerger
114e398f66
Merge commit 'f71f068fb9082ad78c78493c1295074e88a5526c' into eclair-plus-aosp
2010-01-21 17:58:19 -08:00
Xavier Ducrohet
dc9cf66c6e
Merge "Add Dell's vendor ID to fastboot." into eclair
2010-01-21 17:42:36 -08:00
Xavier Ducrohet
af82f21df7
Add Dell's vendor ID to fastboot.
...
Change-Id: I1d88d2a8b3f5c0a9bade2a207b5d9c5a0b776655
2010-01-21 17:39:25 -08:00
Xavier Ducrohet
f71f068fb9
Add DELL's USB Vendor ID to adb - DO NOT MERGE
...
Change-Id: Ie1a6b6a81f50956362aee2a2d6d1b805f0e85b7a
2010-01-21 17:24:36 -08:00
Dan Egnor
288c7cfe1b
Merge "make "adb bugreport" run "bugreport" (which invokes "dumpstate" indirectly via system service) rather than "dumpstate", that way even when adb is not running as root, dumpstate does run as root, and can do things like collect VM traces."
2010-01-21 17:10:50 -08:00
Erik Gilling
25eab084c5
Merge "adb: add Nvidia's vendor id to adb"
2010-01-21 15:24:44 -08:00
Wink Saville
d89a501f8f
resolved conflicts for merge of 988ad28e
to master
...
Change-Id: I02dda00585d5eb4ea74ca7c77bd46f97bb562440
2010-01-21 12:08:07 -08:00
The Android Open Source Project
c8472186e1
merge from open-source master
2010-01-21 11:21:34 -08:00
Kenny Root
91a54c11cb
Add x86-64 checking for Darwin
...
Detect byte endianness when compiled in x86-64 mode in Mac OS X 10.6
Snow Leopard environments or above. Allows compilation of host binaries
in these environments without any changes from its default stock
configuration.
This change doesn't require that the binaries be built in 64-bit, but it
does allow this. One could still use "gcc_select 4.0" with the 10.4 SDK
installed on Snow Leopard to compile in 32-bit mode.
Change-Id: I155a531a9bff450dd6c077b5275652731c59a908
2010-01-21 11:27:10 -06:00
Erik Gilling
6ac5e19299
adb: add Nvidia's vendor id to adb
...
Signed-off-by: Erik Gilling <konkers@android.com>
2010-01-20 18:19:58 -08:00
Erik Gilling
37e9e90436
fastboot: add Nvidia vendor id to fastboot
...
Signed-off-by: Erik Gilling <konkers@android.com>
2010-01-20 17:40:30 -08:00
Dan Egnor
c130ea7c29
make "adb bugreport" run "bugreport" (which invokes "dumpstate"
...
indirectly via system service) rather than "dumpstate", that way
even when adb is not running as root, dumpstate does run as root,
and can do things like collect VM traces.
2010-01-20 13:52:59 -08:00
Colin Cross
eb4ae9c6c3
Merge "Remove definitions that are now in bionic libc"
2010-01-19 13:24:08 -08:00
Mike Lockwood
2b9c1a8b0f
Merge "init: Support bugreports to SD card in user builds if adb is enabled."
2010-01-19 12:28:24 -08:00
Mike Lockwood
7a36210cdb
init: Support bugreports to SD card in user builds if adb is enabled.
...
The rationale being that we do not want this enabled by default, but
tying it to adb being enabled allows convenient bugreport collection
for savvy users and developers using production devices.
Change-Id: I71535b33f0774faf1975c98d106080f2ff12e349
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-01-19 14:41:40 -05:00
Mike Lockwood
37ddce736c
adb: Add Dell's USB vendor ID.
...
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-01-19 11:58:03 -05:00
Mike Lockwood
cc7a5dc770
adb: Add Dell's USB vendor ID.
...
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-01-19 11:46:08 -05:00
Mike Lockwood
c4fc728e70
Merge "adb: Fix problems detecting adb in more complicated USB configurations."
2010-01-17 14:57:57 -08:00
San Mehat
92175e04a5
rootdir: init.rc: Fix typo in chown of /dev/cpuctl
...
Signed-off-by: San Mehat <san@google.com>
2010-01-17 12:21:42 -08:00
Mike Lockwood
07e8f7e875
adb: Fix problems detecting adb in more complicated USB configurations.
...
Change-Id: Ib5b13960a1c75efc97abeca46204c85bba905c71
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-01-17 00:52:27 -05:00
San Mehat
192277c015
rootdir: init.rc: Add netd to startup services list
...
Signed-off-by: San Mehat <san@google.com>
2010-01-15 07:48:35 -08:00
John Wang
988ad28e7f
am 904ac578: Add gsm_rat_switched event tag.
...
Merge commit '904ac578d583f4615ee934da3467b84130285c44' into eclair-plus-aosp
* commit '904ac578d583f4615ee934da3467b84130285c44':
Add gsm_rat_switched event tag.
2010-01-14 17:07:11 -08:00
Colin Cross
1b1fd61295
Remove definitions that are now in bionic libc
2010-01-14 12:47:12 -08:00
John Wang
904ac578d5
Add gsm_rat_switched event tag.
2010-01-13 18:28:15 -08:00
The Android Open Source Project
8547a09ff1
android-2.1_r1 snapshot
2010-01-12 15:19:30 -08:00
San Mehat
eab453c612
toolbox: newfs_msdos: Exit on write failure, and handle bogus geometry from the kernel
...
Signed-off-by: San Mehat <san@google.com>
2010-01-10 11:10:21 -08:00
San Mehat
1851d80959
init.rc: Adjust perms on /asec
...
Signed-off-by: San Mehat <san@google.com>
2010-01-06 17:41:34 -08:00
Oscar Montemayor
d0aa32c3d9
Apps on SD project. Small change to support apps on SD file system key storage.
2010-01-06 16:24:48 -08:00
San Mehat
900570e2a8
init.rc: Create a small tmpfs on /asec so we can create mountpoints
...
Signed-off-by: San Mehat <san@google.com>
2010-01-06 11:02:42 -08:00
San Mehat
6890db33cb
Merge "toolbox: newfs_msdos: If geometry is not available, use some sane-ish defaults"
2010-01-06 10:49:08 -08:00
San Mehat
c40e955727
Merge "init.rc: Add new /asec mount point"
2010-01-06 10:36:16 -08:00
San Mehat
ff3bcd0307
toolbox: newfs_msdos: If geometry is not available, use some sane-ish defaults
...
Signed-off-by: San Mehat <san@google.com>
2010-01-05 13:49:11 -08:00
Joe Onorato
00c0eeac6b
Make adb pull use . as the target file directory if you don't supply one.
2010-01-05 13:42:25 -08:00
San Mehat
37c71dd9a7
init.rc: Add new /asec mount point
...
Signed-off-by: San Mehat <san@google.com>
2010-01-04 09:41:52 -08:00
San Mehat
d674413ff4
sysutils: Add dump() to NetlinkEvent
...
Signed-off-by: San Mehat <san@google.com>
2009-12-24 07:20:36 -08:00
San Mehat
3528f6ba27
vold: Disable build of old vold
...
Signed-off-by: San Mehat <san@google.com>
2009-12-24 07:20:36 -08:00
San Mehat
5184fc5c79
rootdir: Switch to vold.fstab
...
Signed-off-by: San Mehat <san@google.com>
2009-12-24 07:20:36 -08:00
Mike Lockwood
a1871d2a72
adb: Add USB vendor ID for Foxconn
...
Change-Id: I88e4051b6e5cd820cab7e3ec417a545f50925a33
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-12-23 07:45:07 -05:00
Romain Guy
a48d43a077
Add adb reboot-bootloader to match fastboot reboot-bootloader.
...
Also fix the formatting of one of the options in the help message.
2009-12-23 07:44:50 -05:00
Mike Lockwood
a59387b508
adb: fix -d and -e options for "adb forward" command.
...
Change-Id: I9166572a1c398ce5ef1423d19a30895385118ee5
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-12-23 07:44:03 -05:00
Mike Lockwood
6170404867
adb: Add USB vendor ID for Foxconn
...
Change-Id: I88e4051b6e5cd820cab7e3ec417a545f50925a33
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-12-22 09:02:21 -05:00
Ben Cheng
bdcff7d66e
Dump VFP registers and status word when native app crashes.
...
Bug: 2226399
Caveat: d0/d1 appear to be clobbered by ptrace. It will be tracked by a new bug.
2009-12-17 12:53:06 -08:00
Android Git Automerger
b202c54aca
Merge commit 'goog/eclair-plus-aosp'
2009-12-15 00:44:03 -08:00
Dmitry Shmidt
ea036dec45
am 2ed5a457: am 9363b7d5: dhcp: Add hostname support
...
Merge commit '2ed5a4570f5ef3e1c3b6ab27e5c1e3608cceee93'
* commit '2ed5a4570f5ef3e1c3b6ab27e5c1e3608cceee93':
dhcp: Add hostname support
2009-12-14 18:18:28 -08:00
Dmitry Shmidt
2ed5a4570f
am 9363b7d5: dhcp: Add hostname support
...
Merge commit '9363b7d5da7e17842432251384f8dc46902ac323' into eclair-mr2-plus-aosp
* commit '9363b7d5da7e17842432251384f8dc46902ac323':
dhcp: Add hostname support
2009-12-14 16:41:43 -08:00
Dmitry Shmidt
9363b7d5da
dhcp: Add hostname support
...
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2009-12-14 16:05:34 -08:00
Romain Guy
311add489e
Add adb reboot-bootloader to match fastboot reboot-bootloader.
...
Also fix the formatting of one of the options in the help message.
2009-12-14 14:45:17 -08:00
Barry Hayes
8cd186d9e0
Fix bogus pointer math.
2009-12-10 13:26:00 -08:00
Mike Reed
b80acad7d6
am eedfd9d5: am 021529fe: link explicitly against libskia
...
Merge commit 'eedfd9d50490886cb681c0b73ef34649f3d94360'
* commit 'eedfd9d50490886cb681c0b73ef34649f3d94360':
link explicitly against libskia
2009-12-09 18:38:19 -08:00
Mike Reed
a4e26ca940
am f8190342: am 086d66dc: Merge change Ib5291c02 into eclair-mr2
...
Merge commit 'f8190342e7fad57a9540316bb1bc3125a3ebd6aa'
* commit 'f8190342e7fad57a9540316bb1bc3125a3ebd6aa':
first impl for NDK access to bitmaps
2009-12-09 18:38:15 -08:00