diff options
| author | Vladimir Chtchetkine <vchtchetkine@google.com> | 2011-04-01 08:24:25 -0700 |
|---|---|---|
| committer | Vladimir Chtchetkine <vchtchetkine@google.com> | 2011-04-01 08:24:25 -0700 |
| commit | 78305ea16ff559d0483ba24c0eba82b5ac5c5e47 (patch) | |
| tree | 109d54f165b1f5985bde265ba82f34158807c34c | |
| parent | 16292ce718a05da7f28858bbd15d56df51aacbd4 (diff) | |
| download | build-78305ea16ff559d0483ba24c0eba82b5ac5c5e47.zip build-78305ea16ff559d0483ba24c0eba82b5ac5c5e47.tar.gz build-78305ea16ff559d0483ba24c0eba82b5ac5c5e47.tar.bz2 | |
Fix build scripts for vbox_x86 target
Change-Id: Ia1f2bf9f05fcd8f07b240e15c7c01a80c6ca6829
| -rw-r--r-- | target/board/vbox_x86/AndroidBoard.mk | 6 | ||||
| -rw-r--r-- | target/board/vbox_x86/BoardConfig.mk | 2 | ||||
| -rw-r--r-- | target/board/vbox_x86/device.mk | 6 | ||||
| -rw-r--r-- | target/product/vbox_x86.mk | 6 |
4 files changed, 12 insertions, 8 deletions
diff --git a/target/board/vbox_x86/AndroidBoard.mk b/target/board/vbox_x86/AndroidBoard.mk index 2af7dcd..8b13789 100644 --- a/target/board/vbox_x86/AndroidBoard.mk +++ b/target/board/vbox_x86/AndroidBoard.mk @@ -1,7 +1 @@ -LOCAL_PATH := $(call my-dir) -LOCAL_KERNEL := prebuilt/android-x86/kernel/kernel-vbox - -PRODUCT_COPY_FILES += \ - $(LOCAL_KERNEL):kernel \ - $(LOCAL_PATH)/init.rc:root/init.rc diff --git a/target/board/vbox_x86/BoardConfig.mk b/target/board/vbox_x86/BoardConfig.mk index 2bdcced..34b5c7c 100644 --- a/target/board/vbox_x86/BoardConfig.mk +++ b/target/board/vbox_x86/BoardConfig.mk @@ -17,7 +17,7 @@ TARGET_BOOTIMAGE_USE_EXT2 := true # For VirtualBox and likely other emulators BOARD_INSTALLER_CMDLINE := init=/init console=ttyS0 console=tty0 vga=788 verbose -BOARD_KERNEL_CMDLINE := init=/init console=ttyS0 console=tty0 vga=788 verbose androidboot.hardware=generic_x86 androidboot.console=ttyS0 +BOARD_KERNEL_CMDLINE := BOARD_KERNEL_CMDLINE := init=/init qemu=1 console=ttyS0 console=tty0 vga=788 verbose androidboot.hardware=vbox_x86 androidboot.console=ttyS0 android.qemud=ttyS1 TARGET_USE_DISKINSTALLER := true TARGET_DISK_LAYOUT_CONFIG := build/target/board/vbox_x86/disk_layout.conf diff --git a/target/board/vbox_x86/device.mk b/target/board/vbox_x86/device.mk index 0b4dc27..0af7293 100644 --- a/target/board/vbox_x86/device.mk +++ b/target/board/vbox_x86/device.mk @@ -17,10 +17,16 @@ # This is a build configuration for the product aspects that # are specific to the emulator. +LOCAL_PATH := $(call my-dir) + PRODUCT_PROPERTY_OVERRIDES := \ ro.ril.hsxpa=1 \ ro.ril.gprsclass=10 +LOCAL_KERNEL := prebuilt/android-x86/kernel/kernel-vbox + PRODUCT_COPY_FILES := \ development/data/etc/apns-conf.xml:system/etc/apns-conf.xml \ development/data/etc/vold.conf:system/etc/vold.conf + $(LOCAL_KERNEL):kernel \ + $(LOCAL_PATH)/init.rc:root/init.rc diff --git a/target/product/vbox_x86.mk b/target/product/vbox_x86.mk index c32b1eb..f0d4232 100644 --- a/target/product/vbox_x86.mk +++ b/target/product/vbox_x86.mk @@ -18,8 +18,12 @@ # Open-Source part of the tree. It's geared toward a US-centric # build quite specifically for the emulator, and might not be # entirely appropriate to inherit from for on-device configurations. +ifdef NET_ETH0_STARTONBOOT + PRODUCT_PROPERTY_OVERRIDES += net.eth0.startonboot=1 +endif -$(call inherit-product, $(SRC_TARGET_DIR)/product/full_x86.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/board/vbox_x86/device.mk) PRODUCT_NAME := vbox_x86 PRODUCT_DEVICE := vbox_x86 |