Commit Graph

1739 Commits

Author SHA1 Message Date
The Android Open Source Project 5687abe6ef am 544e1f86: merge from open-source master
Merge commit '544e1f866edcbe55b3d8f65d50bc831dfb818657'

* commit '544e1f866edcbe55b3d8f65d50bc831dfb818657':
  Fix sdcard mount issue.
2010-07-16 13:24:29 -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 0515c65a20 am a2657b83: am 84a60712: add meta-files about 3rd party projects
Merge commit 'a2657b83ede5870c52c9a3bfa3ab6f339c5643f1'

* commit 'a2657b83ede5870c52c9a3bfa3ab6f339c5643f1':
  add meta-files about 3rd party projects
2010-07-16 11:59:34 -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 f848a429dd resolved conflicts for merge of 3cac9cb3 to master
Change-Id: I86b5173ad49522eae082bf2a3d096dbfb5240129
2010-07-15 14:01:01 -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
Bruce Beare 50b3995d02 Check fastboot oem command line length
Change-Id: I301af09c4ec460c9049b75cc7f4d2c50cfe00ceb
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
2010-07-15 08:52:01 -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
Dries Harnie 2a743730c7 Userland support for VM interconnection
Change-Id: I699608f3072b39c8da1a7cc313bd0b736e90f225
2010-07-15 13:19:37 +02:00
The Android Open Source Project f4f7697f69 am 0bcda269: merge from open-source master
Merge commit '0bcda269708bbc4f4bd729765e3d4d84e0fd5e60'

* commit '0bcda269708bbc4f4bd729765e3d4d84e0fd5e60':
  Add -R to chmod
  Add -p support to mkdir
2010-07-14 16:16:20 -07: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
Chih-Wei Huang 80ec37aa15 libsysutils: reimplement NetlinkEvent::findParam in the proper way
The original implementation can not find correct parameters for certain
cases. For example, if you have both foo_bar and foo, try to find foo
may be mismatched. The correct way is to match with "=".

Change-Id: I403b1a7b889583a57a4f3a14e575181ce93b10ff
2010-07-14 14:01:30 +08:00
Brian Swetland 335cc39928 am 62a54f3b: am 25b15be9: init: use tmpfs/ftruncate for properties backing store instead of ashmem
Merge commit '62a54f3b1343043528b7e93c1a4311a5e9d5f358'

* commit '62a54f3b1343043528b7e93c1a4311a5e9d5f358':
  init: use tmpfs/ftruncate for properties backing store instead of ashmem
2010-07-13 17:18:42 -07:00
Brian Swetland 587c286f98 am beb72464: am 63e5205c: fastboot: make it so I can actually see the bootloader chatter
Merge commit 'beb72464ff8c501597cd7e098090f7d131dc5ccb'

* commit 'beb72464ff8c501597cd7e098090f7d131dc5ccb':
  fastboot: make it so I can actually see the bootloader chatter
2010-07-13 17:18:39 -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 5db1ebe029 am 8e9cacc5: merge from open-source master
Merge commit '8e9cacc5eb1618b34373ac9131561560a56b4661'

* commit '8e9cacc5eb1618b34373ac9131561560a56b4661':
  Disable building libdiskconfig on non-Linux hosts
2010-07-13 09:10:22 -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 41b92c20f8 am 8d6da447: merge from open-source master
Merge commit '8d6da4478c27c1b65629a4c2966e7382e3f45fb1'

* commit '8d6da4478c27c1b65629a4c2966e7382e3f45fb1':
  Build the host version of libdiskconfig
2010-07-12 15:44:00 -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 c0c799c660 am 0796f618: merge from open-source master
Merge commit '0796f618775b34e14ff624bcfca828d55183b4c5'

* commit '0796f618775b34e14ff624bcfca828d55183b4c5':
  DBUS is not fully implemented. Disable it for now
2010-07-02 12:09:18 -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
Carl Shapiro 64e76cc637 Merge "Remove an obsolete compatibility macro." 2010-07-01 13:30:48 -07:00
Andy McFadden 7ae24be753 am 635dc574: am 57dbb2cb: Merge "Add a HAVE define for pthread_setname_np()." into gingerbread
Merge commit '635dc574e9009f38b34b2e84b6c1a2b5efd2ebc9'

* commit '635dc574e9009f38b34b2e84b6c1a2b5efd2ebc9':
  Add a HAVE define for pthread_setname_np().
2010-07-01 11:56:13 -07:00
Andy McFadden 83d11a7ef8 am efca2263: am cc4d11c2: Merge "Fix sim-eng build." into gingerbread
Merge commit 'efca22636f4036da32f2f6734926442f5ebb422b'

* commit 'efca22636f4036da32f2f6734926442f5ebb422b':
  Fix sim-eng build.
2010-07-01 11:55:54 -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
Mike Lockwood 7a96ba436c libusbhost: The client is now responsible for creating the thread that monitors the bus
This is to allow using a thread that is capable of calling through JNI to Java code
to report USB device attached/removed events.

Change-Id: Ia58592607a2c1f4357b31072044f5db5617d7f5b
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-07-01 11:33:41 -04: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
Andy McFadden 8e9d5c972e Add a HAVE define for pthread_setname_np().
Due to conflicts with recent WebKit, we need to call it
HAVE_ANDROID_PTHREAD_SETNAME_NP.

https://review.source.android.com/#change,15227 has the original
change, which was reverted after the conflict was found.

Change-Id: I7111960a16505558338756dba91eb50cadb582ff
2010-06-30 22:23:21 -07:00
Andy McFadden 9f6d28dc45 Fix sim-eng build.
Include <stddef.h> to get definition of size_t.  Remove inclusion
of <stdint.h>, which doesn't seem to be needed.

Change-Id: Ib7ff231b5ec4b8c672084801fbb294a50cb7c3d7
2010-06-30 22:20:49 -07:00