StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am bc12cd04: merge from open-source master

Browse Source 
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
This commit is contained in:
The Android Open Source Project
2010-05-14 15:54:09 -07:00
committed by Android Git Automerger
parent 216d8448a0 bc12cd04b8
commit 57b44e5287
4 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
target/board/generic_x86/BoardConfig.mk
View File

@@ -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

4
target/board/generic_x86/buildspec-generic_x86.mk
View File

@@ -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

11
target/board/generic_x86/init.rc
View File

@@ -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

7
target/product/generic_x86.mk
View File

@@ -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