Merge commit 'deb9188f4f64d5d475ae28e0cc9eecc6c1f61312' into gingerbread-plus-aosp
* commit 'deb9188f4f64d5d475ae28e0cc9eecc6c1f61312':
It seems that Windows actually does have a header for <stdbool.h>.
Merge commit '17dcc5c57dcffb919f3de65ff7a0134ffa3bd874' into gingerbread-plus-aosp
* commit '17dcc5c57dcffb919f3de65ff7a0134ffa3bd874':
Use makedev helper for device major and minor numbers
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
Merge commit 'f74af26d1899fd85aa80dd65947dac89ef30a42c' into gingerbread-plus-aosp
* commit 'f74af26d1899fd85aa80dd65947dac89ef30a42c':
It seems that Windows actually does have a header for <stdbool.h>.
Merge commit '739cd9d2d4718913889a15d95c840506a2af04d1' into gingerbread-plus-aosp
* commit '739cd9d2d4718913889a15d95c840506a2af04d1':
get rid of compile time warning: "warning: ‘android_ids’ defined but not used"
Merge commit '81ff156bea2804d689fed98b076c2cea0928d752' into gingerbread-plus-aosp
* commit '81ff156bea2804d689fed98b076c2cea0928d752':
do not merge: cherry-picked 44db990d3a from master branch
Merge commit '2ad6067ce491446ab22f59a363d36575a942f5c7' into gingerbread
* commit '2ad6067ce491446ab22f59a363d36575a942f5c7':
do not merge: cherry-picked 44db990d3a from master branch
- 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
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>
Merge commit '7ab237f1efe578fc0462154bc239ad3b6cde2bda' into gingerbread-plus-aosp
* commit '7ab237f1efe578fc0462154bc239ad3b6cde2bda':
Including dl heap stubs for the dalvikvm host build
Merge commit '0c0f68e8ff9fb88eaae614d1da316f0037484886' into gingerbread-plus-aosp
* commit '0c0f68e8ff9fb88eaae614d1da316f0037484886':
Fix a long standing bug in the output buffer size computation.
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>
Merge commit '4ea1a52b1bbbd6e78c5909c75d773416108f5b84' into gingerbread-plus-aosp
* commit '4ea1a52b1bbbd6e78c5909c75d773416108f5b84':
libpixelflinger: ARMv6 specific objects are not used. Remove.
Merge commit '6090dacd1894429baaf13f7b30b2f6e9e2c1617f' into gingerbread-plus-aosp
* commit '6090dacd1894429baaf13f7b30b2f6e9e2c1617f':
libpixelflinger: Move codeflinger test function to test-opengl-codegen
Merge commit '4553b08d7555a103fdbe8623a9cbd826a7e413ff' into gingerbread-plus-aosp
* commit '4553b08d7555a103fdbe8623a9cbd826a7e413ff':
sdcard: Implement statfs, stat time values and change mount point to /mnt/sdcard
Merge commit '03ee9479a4ed67689b9bbccda20c60800a38b178' into gingerbread-plus-aosp
* commit '03ee9479a4ed67689b9bbccda20c60800a38b178':
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>
