Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 57b44e52 authored by The Android Open Source Project's avatar The Android Open Source Project Committed by Android Git Automerger
Browse files

am bc12cd04: merge from open-source master 

Merge commit 'bc12cd04' into kraken

* commit 'bc12cd04':
  Use a different kernel boot line for the disk installer.
  Use a property to enable the eth0 LAN port on the emulator
parents 216d8448 bc12cd04

target/board/generic_x86/BoardConfig.mk

+3 −1
Original line number Diff line number Diff line
@@ -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

target/board/generic_x86/buildspec-generic_x86.mk

+4 −0
Original line number Diff line number Diff line 
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

target/board/generic_x86/init.rc

+11 −0
Original line number Diff line number Diff line
@@ -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

target/product/generic_x86.mk

+7 −0
Original line number Diff line number Diff line
@@ -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