Commit Graph

1714 Commits

Author SHA1 Message Date
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
Werner Johansson 4272a7ad70 am a8c74049: am 931bdcc0: Set explicit timeout on USB control transfer
Merge commit 'a8c7404956b4370162a87ae09b851266a4933b54'

* commit 'a8c7404956b4370162a87ae09b851266a4933b54':
  Set explicit timeout on USB control transfer
2010-06-30 21:52:19 -07:00
Werner Johansson a8c7404956 am 931bdcc0: Set explicit timeout on USB control transfer
Merge commit '931bdcc09a3d805cf25033951adb95c8e5159e46' into gingerbread-plus-aosp

* commit '931bdcc09a3d805cf25033951adb95c8e5159e46':
  Set explicit timeout on USB control transfer
2010-06-30 21:18:54 -07:00
Werner Johansson 931bdcc09a Set explicit timeout on USB control transfer
This attempts to solve the intermittent issues with serial number
showing up as all question marks when issuing "fastboot devices"
2010-06-30 21:03:46 -07:00
Carl Shapiro a3405403a0 Remove an obsolete compatibility macro.
Change-Id: Ibeae0986b6c68f40e414917405a31cc0ad810fc4
2010-06-30 16:49:08 -07:00
Brian Carlstrom d0645bf0cc updated BOOTCLASSPATH to track merge from dalvik-dev
Change-Id: I10e6895ad3647dd789fe5fc7a7d37c4b71c61717
2010-06-30 00:56:35 -07:00
Mike Lockwood fe722218dd Merge "ueventd.rc: Give the USB group read/write access to the MTP USB driver." 2010-06-29 11:59:39 -07:00
Mike Lockwood 69286093d0 ueventd.rc: Give the USB group read/write access to the MTP USB driver.
Change-Id: I305671848dbdf427333dc088f83f88cea1b33945
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-06-29 14:52:20 -04:00
Nick Kralevich b22fd04b63 Merge "Mount /dev with nosuid" 2010-06-29 08:49:25 -07:00
The Android Open Source Project e48b78a2b2 am 0e5a6b12: merge from froyo-plus-aosp
Merge commit '0e5a6b126ebe3d44ba3ab11664bf8bf92bb953e0'

* commit '0e5a6b126ebe3d44ba3ab11664bf8bf92bb953e0':
  Revert "AndroidConfig: define HAVE_PTHREAD_SETNAME_NP"
  AndroidConfig: define HAVE_PTHREAD_SETNAME_NP
2010-06-25 14:21:21 -07:00
Kenny Root 45f7fde3c9 am 0b1ff6be: am eb42170e: Display file sizes larger than 2GB correctly
Merge commit '0b1ff6be08844c541e36fd735b41990453582ec1'

* commit '0b1ff6be08844c541e36fd735b41990453582ec1':
  Display file sizes larger than 2GB correctly
2010-06-25 14:21:11 -07:00
The Android Open Source Project 0e5a6b126e merge from froyo-plus-aosp
Change-Id: I1a3c106234a7910194fe39ca17339796aaf5cfe1
2010-06-25 09:58:37 -07:00
Kenny Root 0b1ff6be08 am eb42170e: Display file sizes larger than 2GB correctly
Merge commit 'eb42170e6c8b70f11dca9965785aa04a80290c72' into gingerbread-plus-aosp

* commit 'eb42170e6c8b70f11dca9965785aa04a80290c72':
  Display file sizes larger than 2GB correctly
2010-06-25 09:50:08 -07:00
Kenny Root eb42170e6c Display file sizes larger than 2GB correctly
File size was cast to a signed integer which displayed files over 2GB as
negative sizes on devices. Use a long long for printing instead which
matches the stat struct.

Change-Id: I0ec07f33716bb4c2e5d120633ed435f637238f46
2010-06-25 09:08:05 -07:00
Bruce Beare e94df975ff DBUS is not fully implemented. Disable it for now
Change-Id: I2286064bffc7e9fa7381aa04d5d20abf11c3aab7
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
2010-06-24 14:35:30 -07:00
Carl Shapiro 3de5dba559 am 2c4676de: am 93b0cb40: Define inline atomic operations for x86 and ARM.
Merge commit '2c4676de62cf8ca7e3759f7f709e29c623495f55'

* commit '2c4676de62cf8ca7e3759f7f709e29c623495f55':
  Define inline atomic operations for x86 and ARM.
2010-06-23 14:30:38 -07:00
Carl Shapiro 2c4676de62 am 93b0cb40: Define inline atomic operations for x86 and ARM.
Merge commit '93b0cb40c18cae594c931677be2b9214420610b7' into gingerbread-plus-aosp

* commit '93b0cb40c18cae594c931677be2b9214420610b7':
  Define inline atomic operations for x86 and ARM.
2010-06-23 14:29:18 -07:00
Carl Shapiro 93b0cb40c1 Define inline atomic operations for x86 and ARM.
This change moves the ARM definitions into GCC extended inline
assembler.  In addition, the same set of x86 definitions are now
shared among all x86 targets.

Change-Id: I6e5aa3a413d0af2acbe5d32994983d35a01fdcb3
2010-06-23 12:51:26 -07:00
Nick Kralevich 150f19e373 Mount /dev with nosuid
Change-Id: I66c7fcf9b65405dfc12d344ef3ed225d0ad2db84
2010-06-22 16:35:43 -07:00
The Android Open Source Project ec219a2ee7 merge from open-source master
Change-Id: I01315984e45ecc0261ea35b5370cbe624cc90cea
2010-06-22 15:30:47 -07:00
Jean-Baptiste Queru d05d26893d Revert "AndroidConfig: define HAVE_PTHREAD_SETNAME_NP"
This reverts commit de50fc1a87.
2010-06-22 15:01:31 -07:00
The Android Open Source Project 6d4113f859 merge from open-source master
Change-Id: Ibc43e8da821400022726b119940708efb052908b
2010-06-22 14:21:21 -07:00
Andy McFadden 424875b818 Merge "AndroidConfig: define HAVE_PTHREAD_SETNAME_NP" 2010-06-22 13:15:28 -07:00
The Android Open Source Project fbd0827372 am 67e6fcd1: merge from froyo-plus-aosp
Merge commit '67e6fcd19533f54ca37cbe72425f55a40a7f0333'

* commit '67e6fcd19533f54ca37cbe72425f55a40a7f0333':
  added vendor ID for http://www.onthegovideo.com/
  Fix build - cpu-features is ARM-specific
  eliminate a compiler warning: signed/unsigned length
  adb: optimize socket-list-walking code
  adb: remove unneeded assignment of id to zero
  adb: clean up 0 --> NULL for pointers
  - creates proper ifc.h and dhcp.h headers for libnetutils
  Adds support for UBFX to JIT and Disassembler
2010-06-21 11:52:24 -07:00
The Android Open Source Project 67e6fcd195 merge from froyo-plus-aosp
Change-Id: Ie231effb4d9dfd63aa98ec08b269c31ce32aa1c0
2010-06-21 11:50:42 -07:00
Wink Saville 96db405f37 Merge "Update the help text to reflect new capabilities of -b parameter." 2010-06-18 11:29:02 -07:00