Commit Graph

1512 Commits

Author SHA1 Message Date
Takeshi Kishimoto 9060ebb5f7 am 91c38539: Added Toshiba\'s USB VID (0x0930) upon their request.
Merge commit '91c3853911ab23728728728276a21dc6fe5fd622' into gingerbread-plus-aosp

* commit '91c3853911ab23728728728276a21dc6fe5fd622':
  Added Toshiba's USB VID (0x0930) upon their request.
2010-07-22 09:14:18 -07:00
The Android Open Source Project ef582bdb8f merge from open-source master
Change-Id: Iaf64136785853002b44ea59759d57816f943096a
2010-07-22 09:12:15 -07:00
Takeshi Kishimoto 91c3853911 Added Toshiba's USB VID (0x0930) upon their request.
Change-Id: I9f7fca6b98b0664ef9af4f7b86f0f5863e91e4c1
2010-07-21 10:21:05 -07:00
Takeshi Kishimoto 81fbbc2d0b Added NEC and PMC's USB VIDs upon their request.
Change-Id: I332ee1e68ff960d41a365aeb96d012253056edd2
2010-07-21 10:20:54 -07:00
Xavier Ducrohet deafd15f2c am 4309d602: Merge "Added Toshiba\'s USB VID (0x0930) upon their request." into gingerbread
Merge commit '4309d602b562eb9f181b0314837e6096577c6c18' into gingerbread-plus-aosp

* commit '4309d602b562eb9f181b0314837e6096577c6c18':
  Added Toshiba's USB VID (0x0930) upon their request.
2010-07-20 23:55:42 -07:00
Xavier Ducrohet 4309d602b5 Merge "Added Toshiba's USB VID (0x0930) upon their request." into gingerbread 2010-07-20 18:01:02 -07:00
Nick Kralevich 3fc108acf2 am fad7204e: resolved conflicts for merge of 5f5d5c8c to gingerbread
Merge commit 'fad7204e9eac20a87afacd7547ed8202a39319f8' into gingerbread-plus-aosp

* commit 'fad7204e9eac20a87afacd7547ed8202a39319f8':
  validate the source of uevent messages
2010-07-20 10:45:06 -07:00
The Android Open Source Project 3c5581da1d merge from open-source master
Change-Id: I90bd618ff8c6bcbe1071468e0d75574feee58d27
2010-07-20 10:11:46 -07:00
The Android Open Source Project 02565fec82 merge from open-source master
Change-Id: Ice679e12b8393621b21a8dafe640dd880a09d35e
2010-07-20 10:11:20 -07:00
Takeshi Kishimoto 29837f94b5 Added Toshiba's USB VID (0x0930) upon their request.
Change-Id: I9f7fca6b98b0664ef9af4f7b86f0f5863e91e4c1
2010-07-20 17:08:09 +08:00
Nick Kralevich fad7204e9e resolved conflicts for merge of 5f5d5c8c to gingerbread
Change-Id: Ieee2cd67d33f3e774fcfd96f8a5f67a0374aa873
2010-07-19 15:53:05 -07:00
Viral Mehta 899913f816 print msg.command in human-readable format
to print msg.command as some odd decimal number is just not helping in debugging;
instead print msg.command as a string

Change-Id: Id1ec770c20c86b8bdae40a0262bf4b63c0213b0a
2010-07-19 15:28:22 -07:00
Jean-Baptiste Queru fdb13f7937 Merge "Fix ADB daemon file descriptor leak" 2010-07-19 15:23:44 -07:00
Nick Kralevich 5f5d5c8cef validate the source of uevent messages
Bug: 2844206
Change-Id: If2eee54181abfc6c7fda0232f98fa6bb5d12c60c
2010-07-19 14:54:50 -07:00
Mike Dodd 7fdcc435b6 am 89118032: Merge "Fix bug in debuggerd so it can successfully find the exidx section in libraries. This should fix the bug where the exception stack wasn\'t being printed past the PC." into gingerbread
Merge commit '891180320f0b08758d053a8562dfcd601ef846b0' into gingerbread-plus-aosp

* commit '891180320f0b08758d053a8562dfcd601ef846b0':
  Fix bug in debuggerd so it can successfully find the exidx section in
2010-07-16 16:47:37 -07:00
Mike Dodd 891180320f Merge "Fix bug in debuggerd so it can successfully find the exidx section in libraries. This should fix the bug where the exception stack wasn't being printed past the PC." into gingerbread 2010-07-16 16:45:38 -07:00
The Android Open Source Project 742150c031 merge from open-source master
Change-Id: I29602fecafc2b6d93b849ada89696a67cfd23353
2010-07-16 13:39:30 -07:00
The Android Open Source Project 64ba76c143 merge from open-source master
Change-Id: I612711a84996e22e826e4920be29c204cf5d7d44
2010-07-16 13:32:03 -07:00
The Android Open Source Project 869cc685b1 merge from open-source master
Change-Id: I9365615f5f94484fb5ab28bb076b25fb4721e2bc
2010-07-16 13:23:40 -07:00
The Android Open Source Project 544e1f866e merge from open-source master
Change-Id: I03f6a73a782706a7c77041db4e626c40dffa647a
2010-07-16 13:22:23 -07:00
The Android Open Source Project a2657b83ed am 84a60712: add meta-files about 3rd party projects
Merge commit '84a60712ddf32fb98793e38ea8dd9703ae1290e2' into gingerbread-plus-aosp

* commit '84a60712ddf32fb98793e38ea8dd9703ae1290e2':
  add meta-files about 3rd party projects
2010-07-16 11:53:06 -07:00
The Android Open Source Project 84a60712dd add meta-files about 3rd party projects
Change-Id: I7a6205fa12f2aa08eff591fb0ce808a48b1e9e74
2010-07-16 11:41:39 -07:00
Jean-Baptiste Queru 22b0b56531 Merge "Use complete hardware name without spaces." 2010-07-16 08:00:45 -07:00
Chris Pearson 1929990434 Fixed LOG_ASSERT() compilation errors in native debug builds.
Invoking LOG_ASSERT, LOG_ALWAYS_FATAL or LOG_ALWAYS_FATAL_IF variadic macros
without the printf format string arg caused compilation errors because the
variable arg list (__VA_ARGS__) was eventually passed to
__android_log_assert() func in place of a required parameter. This error
only occured in debug builds because LOG_ASSERT() is a no-op in release
builds.  This change allows debug builds to succeed.

Change-Id: I7e7b7de3e501133468ce083e0e0d6e699dd59667
Signed-off-by: Chris Pearson <christopherx.c.pearson@intel.com>
2010-07-16 07:56:03 -07:00
Jean-Baptiste Queru e3f6a6e1d3 Merge "fix insmod reading more than one module parameter" 2010-07-16 07:26:05 -07:00
Kenny Root 3cac9cb399 am 38cb1b89: Merge "Add directories for OBB mounting" into gingerbread
Merge commit '38cb1b898c048a5f562c5a2381ec0310f020a587' into gingerbread-plus-aosp

* commit '38cb1b898c048a5f562c5a2381ec0310f020a587':
  Add directories for OBB mounting
2010-07-15 13:41:15 -07:00
Kenny Root 38cb1b898c Merge "Add directories for OBB mounting" into gingerbread 2010-07-15 13:38:51 -07:00
Kenny Root c7858a3dde Add directories for OBB mounting
Change-Id: Ib73e9bca50fb168ab5d147cc260666a770092961
2010-07-15 12:39:53 -07:00
Jean-Baptiste Queru 097b7df625 Merge "Fix sdcard mount issue." 2010-07-15 12:10:10 -07:00
Ravi K Yenduri 2ee12e7a34 Fix sdcard mount issue.
Push vold.fstab on to the emulator, which is now denoted by
TARGET_PRODUCT=full.

Change-Id: I502af9b06903808fa2448c1013ddd8904f6000ca
2010-07-15 09:25:54 -05:00
The Android Open Source Project 0bcda26970 merge from open-source master
Change-Id: If9a300a80228f30166ed42853ae13236aaa2eee5
2010-07-14 16:12:40 -07:00
Jean-Baptiste Queru 6cebee2647 Merge "Add -R to chmod" 2010-07-14 15:17:47 -07:00
Jean-Baptiste Queru 34225919ab Merge "Add -p support to mkdir" 2010-07-14 15:15:53 -07:00
Anthony Newnam 365a09e817 Add -R to chmod
Change-Id: I30f976598bd937f656a3ad3395349f09e695cfce
2010-07-14 13:30:11 -05:00
Anthony Newnam b55de67985 Add -p support to mkdir
Change-Id: Ia0298ccc6b476d6bd6756471c05ef2a345312734
2010-07-14 13:29:42 -05:00
Mike Dodd 6b65747233 Fix bug in debuggerd so it can successfully find the exidx section in
libraries. This should fix the bug where the exception stack wasn't
being printed past the PC.

Change-Id: Ia69ebd49606ee34e329ba43c07b325660248e8fa
2010-07-14 11:28:29 -07:00
Brian Swetland 62a54f3b13 am 25b15be9: init: use tmpfs/ftruncate for properties backing store instead of ashmem
Merge commit '25b15be9120bcdaa0aba622c67ad2c835d9e91ca' into gingerbread-plus-aosp

* commit '25b15be9120bcdaa0aba622c67ad2c835d9e91ca':
  init: use tmpfs/ftruncate for properties backing store instead of ashmem
2010-07-13 17:16:01 -07:00
Brian Swetland beb72464ff am 63e5205c: fastboot: make it so I can actually see the bootloader chatter
Merge commit '63e5205cd2f693bbfa54411f2dd20354bd30ffd8' into gingerbread-plus-aosp

* commit '63e5205cd2f693bbfa54411f2dd20354bd30ffd8':
  fastboot: make it so I can actually see the bootloader chatter
2010-07-13 17:15:57 -07:00
Brian Swetland 25b15be912 init: use tmpfs/ftruncate for properties backing store instead of ashmem
This removes the need for ashmem for early bringup and avoids an issue
with permissions enforcement.

Change-Id: I405b080660934d73048c79d614b6b2ebc43ab182
Signed-off-by: Brian Swetland <swetland@google.com>
2010-07-13 16:43:56 -07:00
Sean McNeil 68fec9a751 Use complete hardware name without spaces.
Many targets use generic first portions like 'OMAP'

Change-Id: I00ba4e64cffc48353c29e409c3c19238024fbd8c
2010-07-13 14:24:39 -07:00
The Android Open Source Project 8e9cacc5eb merge from open-source master
Change-Id: I308dce25270cffc5d1f0056e1e3d3a3fbc6be532
2010-07-13 09:05:17 -07:00
Kenny Root bedaac52a6 Disable building libdiskconfig on non-Linux hosts
libdiskconfig depends deeply on some Linux-specific things like
/usr/include/linux/fs.h which don't exist on other OSes. Disable
building the host library for those platforms.

Change-Id: Ibccdfaa65be788f049ea3c1500f884c8d541e60b
2010-07-12 23:03:45 -07:00
The Android Open Source Project 8d6da4478c merge from open-source master
Change-Id: I5f7a14b12ccff63b9e1813bb4a93c44654a92e4a
2010-07-12 15:41:40 -07:00
Bruce Beare 07b3d09e84 Build the host version of libdiskconfig
Change-Id: I5541d02676b12b728492321ec1344bd826ee560a
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
2010-07-12 14:05:59 -07:00
The Android Open Source Project 0796f61877 merge from open-source master
Change-Id: I1be135f087795bf1789dbf911c585a606bf25778
2010-07-02 11:45:02 -07:00
Brian Swetland 63e5205cd2 fastboot: make it so I can actually see the bootloader chatter
- prefix bootloader messages with (bootloader)
- remove the fancy right justified no newline business

Change-Id: Ica16ebe6a25971db423c5db06300a280d93faf3e
Signed-off-by: Brian Swetland <swetland@google.com>
2010-07-01 13:54:13 -07:00
Andy McFadden 635dc574e9 am 57dbb2cb: Merge "Add a HAVE define for pthread_setname_np()." into gingerbread
Merge commit '57dbb2cb3767c625cfc8d15406b2c4d6b53bb7c6' into gingerbread-plus-aosp

* commit '57dbb2cb3767c625cfc8d15406b2c4d6b53bb7c6':
  Add a HAVE define for pthread_setname_np().
2010-07-01 09:08:28 -07:00
Andy McFadden 57dbb2cb37 Merge "Add a HAVE define for pthread_setname_np()." into gingerbread 2010-07-01 09:05:51 -07:00
Andy McFadden efca22636f am cc4d11c2: Merge "Fix sim-eng build." into gingerbread
Merge commit 'cc4d11c245d5b514ba758cc095a59cd481c92cae' into gingerbread-plus-aosp

* commit 'cc4d11c245d5b514ba758cc095a59cd481c92cae':
  Fix sim-eng build.
2010-07-01 07:33:21 -07:00
Andy McFadden cc4d11c245 Merge "Fix sim-eng build." into gingerbread 2010-07-01 07:30:51 -07:00