summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 17dcc5c5: Use makedev helper for device major and minor numbersColin Cross2010-09-031-4/+1
|\ | | | | | | | | | | | | Merge commit '17dcc5c57dcffb919f3de65ff7a0134ffa3bd874' into gingerbread-plus-aosp * commit '17dcc5c57dcffb919f3de65ff7a0134ffa3bd874': Use makedev helper for device major and minor numbers
| * Use makedev helper for device major and minor numbersColin Cross2010-09-031-4/+1
| | | | | | | | | | | | | | | | | | Major and minor numbers can be greater than 255. Major numbers are 12 bits, and minor numbers are 20 bits. Supporting major and minor numbers > 255 allows the use of the extended block device for extra mmc partitions. Change-Id: I4c42bfe0781069e8e4cb13ebe26e860cdc03f866
* | am f74af26d: It seems that Windows actually does have a header for <stdbool.h>.Dan Bornstein2010-09-011-1/+1
|\ \ | |/ | | | | | | | | | | Merge commit 'f74af26d1899fd85aa80dd65947dac89ef30a42c' into gingerbread-plus-aosp * commit 'f74af26d1899fd85aa80dd65947dac89ef30a42c': It seems that Windows actually does have a header for <stdbool.h>.
| * It seems that Windows actually does have a header for <stdbool.h>.Dan Bornstein2010-09-011-1/+1
| | | | | | | | Change-Id: I443929d07972389a8c9837926a4b7df37bd6a16a
* | am 739cd9d2: Merge "get rid of compile time warning: "warning: ↵Nick Kralevich2010-08-311-1/+1
|\ \ | |/ | | | | | | | | | | | | | | ‘android_ids’ defined but not used"" into gingerbread Merge commit '739cd9d2d4718913889a15d95c840506a2af04d1' into gingerbread-plus-aosp * commit '739cd9d2d4718913889a15d95c840506a2af04d1': get rid of compile time warning: "warning: ‘android_ids’ defined but not used"
| * Merge "get rid of compile time warning: "warning: ‘android_ids’ defined ↵Nick Kralevich2010-08-311-1/+1
| |\ | | | | | | | | | but not used"" into gingerbread
| | * get rid of compile time warning: "warning: ‘android_ids’ defined but not ↵Nick Kralevich2010-08-311-1/+1
| | | | | | | | | | | | | | | | | | used" Change-Id: If365bd88f735d425f37d61bcd5a6903f99f6a454
* | | am 81ff156b: am 2ad6067c: (-s ours) do not merge: cherry-picked ↵Nick Kralevich2010-08-300-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | 44db990d3a4ce0edbdd16fa7ac20693ef601b723 from master branch Merge commit '81ff156bea2804d689fed98b076c2cea0928d752' into gingerbread-plus-aosp * commit '81ff156bea2804d689fed98b076c2cea0928d752': do not merge: cherry-picked 44db990d3a4ce0edbdd16fa7ac20693ef601b723 from master branch
| * | am 2ad6067c: (-s ours) do not merge: cherry-picked ↵Nick Kralevich2010-08-300-0/+0
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | 44db990d3a4ce0edbdd16fa7ac20693ef601b723 from master branch Merge commit '2ad6067ce491446ab22f59a363d36575a942f5c7' into gingerbread * commit '2ad6067ce491446ab22f59a363d36575a942f5c7': do not merge: cherry-picked 44db990d3a4ce0edbdd16fa7ac20693ef601b723 from master branch
| | * do not merge: cherry-picked 44db990d3a4ce0edbdd16fa7ac20693ef601b723 from ↵Nick Kralevich2010-08-301-4/+12
| | | | | | | | | | | | | | | | | | master branch Change-Id: I03e99bfa70ab86eb8eaa2984b6da26a92bd2718a
* | | resolved conflicts for merge of 9682e24b to gingerbread-plus-aospJean-Baptiste Queru2010-08-300-0/+0
|\ \ \ | | | | | | | | | | | | Change-Id: I8cd7e43ee9689bc5c86ed0976536ef5235cbfd84
| * \ \ Merge "libcutils: Reflect the naming change, __ARM_HAVE_LDREX_STREX, in bionic"Jean-Baptiste Queru2010-08-301-1/+1
| |\ \ \
| | * | | libcutils: Reflect the naming change, __ARM_HAVE_LDREX_STREX, in bionicJim Huang2010-08-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch reflect the changes that macro _ARM_HAVE_LDREX_STREX had been renamed to __ARM_HAVE_LDREX_STREX in bionic. Change-Id: I03e8b9f95bdf6ed0da1f53326170f6ee57a37066
* | | | | am 44db990d: Fix bug 2950316. Check return values.Nick Kralevich2010-08-271-4/+12
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | Merge commit '44db990d3a4ce0edbdd16fa7ac20693ef601b723' into gingerbread-plus-aosp * commit '44db990d3a4ce0edbdd16fa7ac20693ef601b723': Fix bug 2950316. Check return values.
| * | | | Fix bug 2950316. Check return values.Nick Kralevich2010-08-271-4/+12
| | | | | | | | | | | | | | | | | | | | Change-Id: I687bb5fb8195d4c1fc863e32a5e233a8b9e74196
* | | | | am 705ab8db: Fix sim build - remove unncesessary header.Robert Greenwalt2010-08-261-1/+0
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Merge commit '705ab8db827b0f7f3389463af67d173c8a94fc8a' into gingerbread-plus-aosp * commit '705ab8db827b0f7f3389463af67d173c8a94fc8a': Fix sim build - remove unncesessary header.
| * | | | Fix sim build - remove unncesessary header.Robert Greenwalt2010-08-251-1/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Ibeba75848eaf732b7d0c7aecc9e7be8dbd509a1c
* | | | | Manual mergeJean-Baptiste Queru2010-08-2528-0/+37587
|\ \ \ \ \ | |/ / / / | | | | | | | | | | Change-Id: I91cabbae567a62e9000446c692175f729cbe67f4
| * | | | Add mksh from CVS 2010/08/24 as system/core/mksh moduleThorsten Glaser2010-08-2428-0/+37587
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | Manual mergeJean-Baptiste Queru2010-08-253-33/+49
|\ \ \ \ \ | |/ / / / | | | | | | | | | | Change-Id: I849703a709fe4bf9ea7181268221d9b648b2e73d
| * | | | Build ash as ash with shell_ash tag; install sh symlinkThorsten Glaser2010-08-241-1/+18
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Thorsten Glaser <tg@mirbsd.org>
| * | | | Merge "Copyright message changed"Jean-Baptiste Queru2010-08-232-32/+31
| |\ \ \ \
| | * | | | Copyright message changedDave Butcher2010-08-192-32/+31
| | | | | | | | | | | | | | | | | | | | | | | | Change requested by Android Open Source Project
* | | | | | Manual mergeJean-Baptiste Queru2010-08-252-22/+194
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | Change-Id: Ic71ed9c392c5dee4a5a9be184d071eb688741f6f
| * | | | | Add API to add a route to IPv4/IPv6 host/gateway.Banavathu, Srinivas Naik2010-08-172-22/+194
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add API to create a route to an IPv4/IPv6 host/gateway through a particular interface. Change-Id: I0ab5d2d211e0fc05f65ee6bb202b7f435cccae2a
* | | | | - creates proper ifc.h and dhcp.h headers for libnetutilsSzymon Jakubczak2010-08-258-114/+163
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
* | | | | am 65e461c4: Fix the pagesize argument parsingMaarten Hooft2010-08-241-2/+2
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Merge commit '65e461c478b000246ef81c3ca5fdd2dbb819d7ad' into gingerbread-plus-aosp * commit '65e461c478b000246ef81c3ca5fdd2dbb819d7ad': Fix the pagesize argument parsing
| * | | | Fix the pagesize argument parsingMaarten Hooft2010-08-241-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I8a3d1a2a70c5ad972d3e150b320ee2184c9d5b4a
* | | | | am fc2f7cb6: Fix usage string.Ying Wang2010-08-231-0/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'fc2f7cb69e3f15a616330a69f0675675c68112f3' into gingerbread-plus-aosp * commit 'fc2f7cb69e3f15a616330a69f0675675c68112f3': Fix usage string.
| * | | | Fix usage string.Ying Wang2010-08-231-0/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Iaa99a1bb8bb6998082f3553689b5b812a6471514
* | | | | am 7ab237f1: Including dl heap stubs for the dalvikvm host buildJesse Wilson2010-08-181-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '7ab237f1efe578fc0462154bc239ad3b6cde2bda' into gingerbread-plus-aosp * commit '7ab237f1efe578fc0462154bc239ad3b6cde2bda': Including dl heap stubs for the dalvikvm host build
| * | | | Including dl heap stubs for the dalvikvm host buildJesse Wilson2010-08-181-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I9d0ce98d433f71db25c58bf464ec9317552cfae6
* | | | | am 0c0f68e8: Fix a long standing bug in the output buffer size computation.Carl Shapiro2010-08-181-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '0c0f68e8ff9fb88eaae614d1da316f0037484886' into gingerbread-plus-aosp * commit '0c0f68e8ff9fb88eaae614d1da316f0037484886': Fix a long standing bug in the output buffer size computation.
| * | | | Fix a long standing bug in the output buffer size computation.Carl Shapiro2010-08-171-1/+1
| | | | | | | | | | | | | | | | | | | | git cherry-pick -e 2a7f2ae7d4b25f89e36be04e47b9e7a3d76e0cfd
* | | | | Revert "- creates proper ifc.h and dhcp.h headers for libnetutils"Jean-Baptiste Queru2010-08-188-163/+114
| | | | | | | | | | | | | | | | | | | | This reverts commit c88e09cb98fb3690c3cf49f5a825532e0d9bf300.
* | | | | am 5dfd90e5: Merge "pixelflinger: Fix function naming typo: gglBitBlti"Jean-Baptiste Queru2010-08-172-2/+2
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Merge commit '5dfd90e5c79774d9981d25ab4defbd1e1f652c34' into gingerbread-plus-aosp * commit '5dfd90e5c79774d9981d25ab4defbd1e1f652c34': pixelflinger: Fix function naming typo: gglBitBlti
| * | | | Merge "pixelflinger: Fix function naming typo: gglBitBlti"Jean-Baptiste Queru2010-08-162-2/+2
| |\ \ \ \
| | * | | | pixelflinger: Fix function naming typo: gglBitBltiJim Huang2010-08-102-2/+2
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | am 4ea1a52b: Merge "libpixelflinger: ARMv6 specific objects are not used. ↵Jean-Baptiste Queru2010-08-171-18/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove." Merge commit '4ea1a52b1bbbd6e78c5909c75d773416108f5b84' into gingerbread-plus-aosp * commit '4ea1a52b1bbbd6e78c5909c75d773416108f5b84': libpixelflinger: ARMv6 specific objects are not used. Remove.
| * | | | Merge "libpixelflinger: ARMv6 specific objects are not used. Remove."Jean-Baptiste Queru2010-08-161-18/+0
| |\ \ \ \
| | * | | | libpixelflinger: ARMv6 specific objects are not used. Remove.Jim Huang2010-08-101-18/+0
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | am 6090dacd: libpixelflinger: Move codeflinger test function to ↵Jim Huang2010-08-173-26/+51
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test-opengl-codegen Merge commit '6090dacd1894429baaf13f7b30b2f6e9e2c1617f' into gingerbread-plus-aosp * commit '6090dacd1894429baaf13f7b30b2f6e9e2c1617f': libpixelflinger: Move codeflinger test function to test-opengl-codegen
| * | | | libpixelflinger: Move codeflinger test function to test-opengl-codegenJim Huang2010-08-103-26/+51
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | There is no need to include codeflinger test function in libpixelflinger. Instead, it should exist in test-opengl-codegen. Change-Id: Ic5b0bd1f754b2ac678d4e16565568c70ceb8d325
* | | | am 4553b08d: sdcard: Implement statfs, stat time values and change mount ↵Mike Lockwood2010-08-161-5/+36
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | sdcard: Implement statfs, stat time values and change mount point to /mnt/sdcardMike Lockwood2010-08-161-5/+36
| | | | | | | | | | | | | | | | | | | | Change-Id: Iac2c4ec47af7d47d76a82916866ad36782caf25c Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | am b14a2c6e: fix up permissionsBrian Swetland2010-08-121-3/+15
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit 'b14a2c6e34b197870433386fb809d34b58b30fc0' into gingerbread-plus-aosp * commit 'b14a2c6e34b197870433386fb809d34b58b30fc0': fix up permissions
| * | | fix up permissionsBrian Swetland2010-08-121-3/+15
| | | | | | | | | | | | | | | | Change-Id: I93c828ebc755ad2a2055066c8af65dfde7dc7b2e
* | | | am 03ee9479: sdcard: a program to create a "virtual" /sdcard pointed at a pathBrian Swetland2010-08-123-0/+1340
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '03ee9479a4ed67689b9bbccda20c60800a38b178' into gingerbread-plus-aosp * commit '03ee9479a4ed67689b9bbccda20c60800a38b178': sdcard: a program to create a "virtual" /sdcard pointed at a path
| * | | sdcard: a program to create a "virtual" /sdcard pointed at a pathBrian Swetland2010-08-123-0/+1340
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | am 8417d698: handle 4096 byte pages if requested via --pagesizeBrian Swetland2010-08-111-1/+7
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '8417d698cff733f3c5de08f2fa96b67bf4a9f795' into gingerbread-plus-aosp * commit '8417d698cff733f3c5de08f2fa96b67bf4a9f795': handle 4096 byte pages if requested via --pagesize
generated by cgit v1.1 at 2025-01-26 13:27:19 +0000