Commit Graph

1721 Commits

Author SHA1 Message Date
Nick Kralevich 4692599cf7 am 44db990d: Fix bug 2950316. Check return values.
Merge commit '44db990d3a4ce0edbdd16fa7ac20693ef601b723' into gingerbread-plus-aosp

* commit '44db990d3a4ce0edbdd16fa7ac20693ef601b723':
  Fix bug 2950316.  Check return values.
2010-08-27 15:28:24 -07:00
Nick Kralevich 44db990d3a Fix bug 2950316. Check return values.
Change-Id: I687bb5fb8195d4c1fc863e32a5e233a8b9e74196
2010-08-27 14:37:11 -07:00
Robert Greenwalt 64a053b673 am 705ab8db: Fix sim build - remove unncesessary header.
Merge commit '705ab8db827b0f7f3389463af67d173c8a94fc8a' into gingerbread-plus-aosp

* commit '705ab8db827b0f7f3389463af67d173c8a94fc8a':
  Fix sim build - remove unncesessary header.
2010-08-26 09:02:48 -07:00
Robert Greenwalt 705ab8db82 Fix sim build - remove unncesessary header.
Change-Id: Ibeba75848eaf732b7d0c7aecc9e7be8dbd509a1c
2010-08-25 11:21:36 -07:00
Jean-Baptiste Queru 41c3eed8ab Manual merge
Change-Id: I91cabbae567a62e9000446c692175f729cbe67f4
2010-08-25 09:56:16 -07:00
Jean-Baptiste Queru 468f23ac2f Manual merge
Change-Id: I849703a709fe4bf9ea7181268221d9b648b2e73d
2010-08-25 09:54:23 -07:00
Jean-Baptiste Queru bdcf98ddbf Manual merge
Change-Id: Ic71ed9c392c5dee4a5a9be184d071eb688741f6f
2010-08-25 09:25:12 -07:00
Szymon Jakubczak 8c85a00db6 - creates proper ifc.h and dhcp.h headers for libnetutils
- adds ifc_set_hwaddr
- adds hwaddr command to netcfg
- code reuse: dhcp_configure calls ifc_configure; inet_ntoa is used for printing
- consistency: use net.XXX.dnsX properties in favor of dhcp.XXX.dnsX properties
  (see related change to WifiStateTracker)
- updated system/core/nexus to use new headers, although not sure if
anybody still uses nexus

Change-Id: Idd70c0ac6e89b38e86816578c33eff805d30cac4
2010-08-25 08:13:42 -07:00
Maarten Hooft 2c72df9987 am 65e461c4: Fix the pagesize argument parsing
Merge commit '65e461c478b000246ef81c3ca5fdd2dbb819d7ad' into gingerbread-plus-aosp

* commit '65e461c478b000246ef81c3ca5fdd2dbb819d7ad':
  Fix the pagesize argument parsing
2010-08-24 15:30:04 -07:00
Maarten Hooft 65e461c478 Fix the pagesize argument parsing
Change-Id: I8a3d1a2a70c5ad972d3e150b320ee2184c9d5b4a
2010-08-24 15:24:50 -07:00
Thorsten Glaser ba2627c6cd Add mksh from CVS 2010/08/24 as system/core/mksh module
Both shells (ash from system/core/sh, and mksh) are built by
default but only the one where $(TARGET_SHELL) is set to is
actually installed (the shell and the mkshrc configuration
file are tagged shell_mksh for this to work).

Signed-off-by: Thorsten Glaser <tg@mirbsd.org>
2010-08-24 18:25:55 +02:00
Thorsten Glaser bdc36d641c Build ash as ash with shell_ash tag; install sh symlink
Signed-off-by: Thorsten Glaser <tg@mirbsd.org>
2010-08-24 18:23:40 +02:00
Jean-Baptiste Queru 69507eb065 Merge "Copyright message changed" 2010-08-23 18:40:03 -07:00
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