Commit Graph

1708 Commits

Author SHA1 Message Date
Ying Wang 0cd43305e9 am fc2f7cb6: Fix usage string.
Merge commit 'fc2f7cb69e3f15a616330a69f0675675c68112f3' into gingerbread-plus-aosp

* commit 'fc2f7cb69e3f15a616330a69f0675675c68112f3':
  Fix usage string.
2010-08-23 13:14:42 -07:00
Ying Wang fc2f7cb69e Fix usage string.
Change-Id: Iaa99a1bb8bb6998082f3553689b5b812a6471514
2010-08-23 12:59:23 -07:00
Dave Butcher ef18202fd1 Copyright message changed
Change requested by Android Open Source Project
2010-08-19 12:31:34 +01:00
Jesse Wilson 2c9ea21de3 am 7ab237f1: Including dl heap stubs for the dalvikvm host build
Merge commit '7ab237f1efe578fc0462154bc239ad3b6cde2bda' into gingerbread-plus-aosp

* commit '7ab237f1efe578fc0462154bc239ad3b6cde2bda':
  Including dl heap stubs for the dalvikvm host build
2010-08-18 22:58:42 -07:00
Jesse Wilson 7ab237f1ef Including dl heap stubs for the dalvikvm host build
Change-Id: I9d0ce98d433f71db25c58bf464ec9317552cfae6
2010-08-18 21:23:13 -07:00
Carl Shapiro 703c85c69d am 0c0f68e8: Fix a long standing bug in the output buffer size computation.
Merge commit '0c0f68e8ff9fb88eaae614d1da316f0037484886' into gingerbread-plus-aosp

* commit '0c0f68e8ff9fb88eaae614d1da316f0037484886':
  Fix a long standing  bug in the output buffer size computation.
2010-08-18 13:38:04 -07:00
Jean-Baptiste Queru 58b64acef0 Revert "- creates proper ifc.h and dhcp.h headers for libnetutils"
This reverts commit c88e09cb98.
2010-08-18 11:16:00 -07:00
Kan-Ru Chen a7e96642a9 codeflinger: Correct misleading comment of STM instruction
According to the ARM Architecture Reference Manual, the comment on
STM instruction should be in reverse order.

Change-Id: I4af852a0478798ff7b02ab9c29c68e320ff78696
Signed-off-by: Kan-Ru Chen <kanru@0xlab.org>
2010-08-18 17:02:34 +08:00
Banavathu, Srinivas Naik 8984bb9691 Add API to add a route to IPv4/IPv6 host/gateway.
Add API to create a route to an IPv4/IPv6 host/gateway through a particular
interface.

Change-Id: I0ab5d2d211e0fc05f65ee6bb202b7f435cccae2a
2010-08-17 21:50:41 -07:00
Carl Shapiro 0c0f68e8ff Fix a long standing bug in the output buffer size computation.
git cherry-pick -e 2a7f2ae7d4
2010-08-17 17:53:35 -07:00
Jean-Baptiste Queru 838336fa61 am 5dfd90e5: Merge "pixelflinger: Fix function naming typo: gglBitBlti"
Merge commit '5dfd90e5c79774d9981d25ab4defbd1e1f652c34' into gingerbread-plus-aosp

* commit '5dfd90e5c79774d9981d25ab4defbd1e1f652c34':
  pixelflinger: Fix function naming typo: gglBitBlti
2010-08-17 07:48:42 -07:00
Jean-Baptiste Queru 933dc05929 am 4ea1a52b: Merge "libpixelflinger: ARMv6 specific objects are not used. Remove."
Merge commit '4ea1a52b1bbbd6e78c5909c75d773416108f5b84' into gingerbread-plus-aosp

* commit '4ea1a52b1bbbd6e78c5909c75d773416108f5b84':
  libpixelflinger: ARMv6 specific objects are not used.  Remove.
2010-08-17 07:48:41 -07:00
Jim Huang 7caef0c70f am 6090dacd: libpixelflinger: Move codeflinger test function to test-opengl-codegen
Merge commit '6090dacd1894429baaf13f7b30b2f6e9e2c1617f' into gingerbread-plus-aosp

* commit '6090dacd1894429baaf13f7b30b2f6e9e2c1617f':
  libpixelflinger: Move codeflinger test function to test-opengl-codegen
2010-08-17 07:48:36 -07:00
Mike Lockwood b1fb953877 am 4553b08d: sdcard: Implement statfs, stat time values and change mount point to /mnt/sdcard
Merge commit '4553b08d7555a103fdbe8623a9cbd826a7e413ff' into gingerbread-plus-aosp

* commit '4553b08d7555a103fdbe8623a9cbd826a7e413ff':
  sdcard: Implement statfs, stat time values and change mount point to /mnt/sdcard
2010-08-16 21:32:27 -07:00
Mike Lockwood 4553b08d75 sdcard: Implement statfs, stat time values and change mount point to /mnt/sdcard
Change-Id: Iac2c4ec47af7d47d76a82916866ad36782caf25c
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-08-16 14:16:13 -04:00
Jean-Baptiste Queru 5dfd90e5c7 Merge "pixelflinger: Fix function naming typo: gglBitBlti" 2010-08-16 09:33:04 -07:00
Jean-Baptiste Queru 4ea1a52b1b Merge "libpixelflinger: ARMv6 specific objects are not used. Remove." 2010-08-16 09:25:13 -07:00
Brian Swetland a828078397 am b14a2c6e: fix up permissions
Merge commit 'b14a2c6e34b197870433386fb809d34b58b30fc0' into gingerbread-plus-aosp

* commit 'b14a2c6e34b197870433386fb809d34b58b30fc0':
  fix up permissions
2010-08-12 18:24:19 -07:00
Brian Swetland b14a2c6e34 fix up permissions
Change-Id: I93c828ebc755ad2a2055066c8af65dfde7dc7b2e
2010-08-12 18:22:23 -07:00
Brian Swetland 4b2fc45c15 am 03ee9479: sdcard: a program to create a "virtual" /sdcard pointed at a path
Merge commit '03ee9479a4ed67689b9bbccda20c60800a38b178' into gingerbread-plus-aosp

* commit '03ee9479a4ed67689b9bbccda20c60800a38b178':
  sdcard: a program to create a "virtual" /sdcard pointed at a path
2010-08-12 18:05:49 -07:00
Brian Swetland 03ee9479a4 sdcard: a program to create a "virtual" /sdcard pointed at a path
sdcard is a program that uses FUSE to emulate FAT-on-sdcard style
directory permissions (all files are given fixed owner, group, and
permissions at creation, owner, group, and permissions are not
changeable, symlinks and hardlinks are not createable, etc.

usage: sdcard <path> <uid> <gid>

It must be run as root, but will change to uid/gid as soon as it
mounts a filesystem on /sdcard.  It will refuse to run if uid or
gid are zero.

Change-Id: I9a5d2e5daaebeee632f8470172cbb77b7fa689f8
Signed-off-by: Brian Swetland <swetland@google.com>
2010-08-12 18:01:08 -07:00
Brian Swetland 7b9e7d9006 am 8417d698: handle 4096 byte pages if requested via --pagesize
Merge commit '8417d698cff733f3c5de08f2fa96b67bf4a9f795' into gingerbread-plus-aosp

* commit '8417d698cff733f3c5de08f2fa96b67bf4a9f795':
  handle 4096 byte pages if requested via --pagesize
2010-08-11 17:01:42 -07:00
Brian Swetland 8417d698cf handle 4096 byte pages if requested via --pagesize
Change-Id: I9299ebeced85dcf5e6e4686b99b28b9786be4f25
Signed-off-by: Brian Swetland <swetland@google.com>
2010-08-11 16:56:49 -07:00
Jim Huang 6e1a9430e8 pixelflinger: Fix function naming typo: gglBitBlti
From the functionality, the function gglBitBlti() implemented bit-block
(image) transfer operation in which several bitmaps are combined into
one using a raster operator.  Renaming to gglBitBlit() should be
explicit.

Change-Id: I23886623b5421131cf7c7bfb8ec67c3809566c93
2010-08-10 02:56:47 +08:00
Jim Huang 9fcaff4621 libpixelflinger: ARMv6 specific objects are not used. Remove.
This patch attempts to remove the generation of libpixelflinger_armv6,
which contains the ARMv6 specific object - rotate90CW_4x4_16v6.o.  But,
libpixelflinger_armv6 is not actually used by other projects.

Change-Id: I0e26fa2cf8b4dacfd208dd4279539c3e5b07580e
2010-08-10 02:18:53 +08:00
Jim Huang 6090dacd18 libpixelflinger: Move codeflinger test function to test-opengl-codegen
There is no need to include codeflinger test function in
libpixelflinger.  Instead, it should exist in test-opengl-codegen.

Change-Id: Ic5b0bd1f754b2ac678d4e16565568c70ceb8d325
2010-08-10 02:07:38 +08:00
Jim Huang fddc33858c libcutils: Reflect the naming change, __ARM_HAVE_LDREX_STREX, in bionic
This patch reflect the changes that macro  _ARM_HAVE_LDREX_STREX had
been renamed to __ARM_HAVE_LDREX_STREX in bionic.

Change-Id: I03e8b9f95bdf6ed0da1f53326170f6ee57a37066
2010-08-09 05:42:41 +08:00
Brian Carlstrom 3c659a8d64 am f2af88e8: Tracking merge of dalvik-dev to gingerbread
Merge commit 'f2af88e81af5efb2d585963507f798d5a8b93d67' into gingerbread-plus-aosp

* commit 'f2af88e81af5efb2d585963507f798d5a8b93d67':
  Tracking merge of dalvik-dev to gingerbread
2010-08-05 10:39:18 -07:00
Brian Carlstrom f2af88e81a Tracking merge of dalvik-dev to gingerbread
git cherry-pick --no-commit b99a099c
git cherry-pick --no-commit 9811671e02
git cherry-pick --no-commit d0645bf0cc

Change-Id: Ie70fecaeaba97a25f114cd2717e381b5107533b1
2010-08-04 15:45:52 -07:00
Jean-Baptiste Queru 60c8f863ca resolved conflicts for merge of 0fcbdb41 to gingerbread-plus-aosp
Change-Id: I1396cd97b28f316849016d55596ad52fffd3235c
2010-07-29 15:53:16 -07:00
Jean-Baptiste Queru 0fcbdb4147 Merge "Userland support for VM interconnection" 2010-07-29 15:04:57 -07:00
Jean-Baptiste Queru 42b871f1bf am c37ba1c9: Merge "Check fastboot oem command line length"
Merge commit 'c37ba1c916d73fbf35c6faba1e252e2916d2d41d' into gingerbread-plus-aosp

* commit 'c37ba1c916d73fbf35c6faba1e252e2916d2d41d':
  Check fastboot oem command line length
2010-07-29 11:08:02 -07:00
Jean-Baptiste Queru c37ba1c916 Merge "Check fastboot oem command line length" 2010-07-29 11:00:02 -07:00
Kenny Root 331eb52d61 am 5a0adf95: Merge "Add basic lsof command" into gingerbread
Merge commit '5a0adf95b1170d3d9ec91b0106662cd17514f0e4' into gingerbread-plus-aosp

* commit '5a0adf95b1170d3d9ec91b0106662cd17514f0e4':
  Add basic lsof command
2010-07-27 13:00:58 -07:00
Kenny Root 5a0adf95b1 Merge "Add basic lsof command" into gingerbread 2010-07-27 12:58:23 -07:00
Kenny Root 65757da0c9 am 53308d4c: Correct copyright header for uptime and NOTICE
Merge commit '53308d4cd5c4414402e979a6771f7ef3b35f5c2f' into gingerbread-plus-aosp

* commit '53308d4cd5c4414402e979a6771f7ef3b35f5c2f':
  Correct copyright header for uptime and NOTICE
2010-07-27 11:39:19 -07:00
Kenny Root 53308d4cd5 Correct copyright header for uptime and NOTICE
Change-Id: I89f91c21db87955b20b1ef9b4590f7009f106b26
2010-07-27 11:26:06 -07:00
Kenny Root 8b9b105bc7 Add basic lsof command
Basic "list open files" command.

Supports reading all processes for their "exe", "cwd", "root", and "fd"
entries.

Change-Id: I2e2f0911dd65a1993aa1ce9f51222bf264a9d68d
2010-07-27 11:22:20 -07:00
aimitakeshi e572d596b3 - Add drm and drmio service
- Add /data/drm directory for storing DRM related data

Change-Id: Ifd8922a3de109dbf5cd3f9cabbf4e5689b16c1d7
2010-07-27 08:38:35 +09:00
Bruce Beare 1298bb7993 am 96a2bb62: Set the modes for rc.* files in /system/etc
Merge commit '96a2bb622d38f3c875997e4cacb423fa9ef4ea76' into gingerbread-plus-aosp

* commit '96a2bb622d38f3c875997e4cacb423fa9ef4ea76':
  Set the modes for rc.* files in /system/etc
2010-07-23 11:04:38 -07:00
Bruce Beare 96a2bb622d Set the modes for rc.* files in /system/etc
Change-Id: I0897897cdffa66afa4f818f7ebcf0a9b70c517ea
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
2010-07-23 10:52:32 -07:00
Jean-Baptiste Queru 1ab3d67f53 am 315c3a74: Merge "libsysutils: reimplement NetlinkEvent::findParam in the proper way"
Merge commit '315c3a74a1fcf1d421ffff0857f998a98a1c224a' into gingerbread-plus-aosp

* commit '315c3a74a1fcf1d421ffff0857f998a98a1c224a':
  libsysutils: reimplement NetlinkEvent::findParam in the proper way
2010-07-22 09:53:28 -07:00
Jean-Baptiste Queru 315c3a74a1 Merge "libsysutils: reimplement NetlinkEvent::findParam in the proper way" 2010-07-22 09:44:36 -07:00
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