diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-05-14 15:54:09 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-14 15:54:09 -0700 |
| commit | 57b44e528741357c02844c4f85b4f58f547979ce (patch) | |
| tree | fd729894c104bc8b0d7d195fd0c5ad3cfcedd7e7 /target | |
| parent | 216d8448a04f3c7794d1e4ec1178a2bf6da2ba95 (diff) | |
| parent | bc12cd04b878a9c3520abd21600c2078c930adc3 (diff) | |
| download | build-57b44e528741357c02844c4f85b4f58f547979ce.zip build-57b44e528741357c02844c4f85b4f58f547979ce.tar.gz build-57b44e528741357c02844c4f85b4f58f547979ce.tar.bz2 | |
am bc12cd04: merge from open-source master
Merge commit 'bc12cd04b878a9c3520abd21600c2078c930adc3' into kraken
* commit 'bc12cd04b878a9c3520abd21600c2078c930adc3':
Use a different kernel boot line for the disk installer.
Use a property to enable the eth0 LAN port on the emulator
Diffstat (limited to 'target')
| -rw-r--r-- | target/board/generic_x86/BoardConfig.mk | 4 | ||||
| -rw-r--r-- | target/board/generic_x86/buildspec-generic_x86.mk | 4 | ||||
| -rw-r--r-- | target/board/generic_x86/init.rc | 11 | ||||
| -rw-r--r-- | target/product/generic_x86.mk | 7 |
4 files changed, 25 insertions, 1 deletions
diff --git a/target/board/generic_x86/BoardConfig.mk b/target/board/generic_x86/BoardConfig.mk index be8aeb7..608aee1 100644 --- a/target/board/generic_x86/BoardConfig.mk +++ b/target/board/generic_x86/BoardConfig.mk @@ -10,7 +10,9 @@ TARGET_CPU_ABI := x86 TARGET_USERIMAGES_USE_EXT2 := true TARGET_BOOTIMAGE_USE_EXT2 := true -BOARD_KERNEL_CMDLINE := init=/init console=tty0 androidboot.hardware=generic_x86 vga=788 +# For VirtualBox and likely other emulators +BOARD_INSTALLER_CMDLINE := init=/init console=ttyS0 console=tty0 androidboot.hardware=generic_x86 vga=788 verbose +BOARD_KERNEL_CMDLINE := init=/init console=tty0 console=ttyS0 androidboot.hardware=generic_x86 vga=788 TARGET_USE_DISKINSTALLER := true TARGET_DISK_LAYOUT_CONFIG := build/target/board/generic_x86/disk_layout.conf BOARD_BOOTIMAGE_MAX_SIZE := 8388608 diff --git a/target/board/generic_x86/buildspec-generic_x86.mk b/target/board/generic_x86/buildspec-generic_x86.mk index 5c4e6a5..fbc3947 100644 --- a/target/board/generic_x86/buildspec-generic_x86.mk +++ b/target/board/generic_x86/buildspec-generic_x86.mk @@ -1,3 +1,7 @@ BUILD_ENV_SEQUENCE_NUMBER := 9 DISABLE_DEXPREOPT := true TARGET_ARCH := x86 + +# The eth0 device should be started with dhcp on boot. +# Useful for emulators that don't provide a wifi connection. +NET_ETH0_STARTONBOOT := true diff --git a/target/board/generic_x86/init.rc b/target/board/generic_x86/init.rc index 2a6f665..235083d 100644 --- a/target/board/generic_x86/init.rc +++ b/target/board/generic_x86/init.rc @@ -191,6 +191,7 @@ on boot class_start default + ## Daemon processes to be run by init. ## service console /system/bin/sh @@ -241,3 +242,13 @@ service brick /system/bin/wipe nuke service installd /system/bin/installd socket installd stream 600 system system + +# +# Set by PRODUCT_PROPERTY_OVERRIDES in <product>.mk +on property:net.eth0.startonboot=1 + setprop ro.com.android.dataroaming true + start start_eth0 + +service start_eth0 /system/bin/netcfg eth0 dhcp + oneshot + disabled diff --git a/target/product/generic_x86.mk b/target/product/generic_x86.mk index 00f2822..9713900 100644 --- a/target/product/generic_x86.mk +++ b/target/product/generic_x86.mk @@ -25,3 +25,10 @@ PRODUCT_BRAND := generic_x86 PRODUCT_DEVICE := generic_x86 PRODUCT_NAME := generic_x86 PRODUCT_POLICY := android.policy_phone + +# If running on an emulator or some other device that has a LAN connection +# that isn't a wifi connection. This will instruct init.rc to enable the +# network connection so that you can use it with ADB +ifdef NET_ETH0_STARTONBOOT + PRODUCT_PROPERTY_OVERRIDES += net.eth0.startonboot=1 +endif |