diff options
Diffstat (limited to 'target/board/vbox_x86')
-rw-r--r-- | target/board/vbox_x86/AndroidBoard.mk | 6 | ||||
-rw-r--r-- | target/board/vbox_x86/BoardConfig.mk | 11 | ||||
-rw-r--r-- | target/board/vbox_x86/device.mk | 9 | ||||
-rw-r--r-- | target/board/vbox_x86/init.vbox_x86.rc | 52 |
4 files changed, 67 insertions, 11 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 525074e..94df57c 100644 --- a/target/board/vbox_x86/BoardConfig.mk +++ b/target/board/vbox_x86/BoardConfig.mk @@ -5,7 +5,6 @@ TARGET_ARCH=x86 DISABLE_DEXPREOPT := true TARGET_COMPRESS_MODULE_SYMBOLS := false -TARGET_PRELINK_MODULE := false TARGET_NO_RECOVERY := true TARGET_HARDWARE_3D := false BOARD_USES_GENERIC_AUDIO := true @@ -18,16 +17,20 @@ 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 := 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 BOARD_BOOTIMAGE_MAX_SIZE := 8388608 BOARD_SYSLOADER_MAX_SIZE := 7340032 BOARD_FLASH_BLOCK_SIZE := 512 -BOARD_USERDATAIMAGE_PARTITION_SIZE := 50M -BOARD_INSTALLERIMAGE_PARTITION_SIZE := 500M +# 50M +BOARD_USERDATAIMAGE_PARTITION_SIZE := 52428800 +# 500M +BOARD_INSTALLERIMAGE_PARTITION_SIZE := 524288000 TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true +# Reserve 265M for the system partition +BOARD_SYSTEMIMAGE_PARTITION_SIZE := 268435456 # The eth0 device should be started with dhcp on boot. diff --git a/target/board/vbox_x86/device.mk b/target/board/vbox_x86/device.mk index 0b4dc27..a028b98 100644 --- a/target/board/vbox_x86/device.mk +++ b/target/board/vbox_x86/device.mk @@ -17,10 +17,17 @@ # 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 + development/data/etc/vold.conf:system/etc/vold.conf \ + build/target/board/vbox_x86/init.rc:root/init.rc \ + build/target/board/vbox_x86/init.vbox_x86.rc:root/init.vbox_x86.rc \ + $(LOCAL_KERNEL):kernel diff --git a/target/board/vbox_x86/init.vbox_x86.rc b/target/board/vbox_x86/init.vbox_x86.rc new file mode 100644 index 0000000..4c5d55c --- /dev/null +++ b/target/board/vbox_x86/init.vbox_x86.rc @@ -0,0 +1,52 @@ +on boot + setprop ARGH ARGH + setprop net.eth0.dns1 10.0.2.3 + setprop net.gprs.local-ip 10.0.2.15 + setprop ro.radio.use-ppp no + setprop ro.build.product generic + setprop ro.product.device generic + +# fake some battery state + setprop status.battery.state Slow + setprop status.battery.level 5 + setprop status.battery.level_raw 50 + setprop status.battery.level_scale 9 + +# disable some daemons the emulator doesn't want + stop dund + stop akmd + + setprop ro.setupwizard.mode EMULATOR + +# enable Google-specific location features, +# like NetworkLocationProvider and LocationCollector + setprop ro.com.google.locationfeatures 1 + +# For the emulator, which bypasses Setup Wizard, you can specify +# account info for the device via these two properties. Google +# Login Service will insert these accounts into the database when +# it is created (ie, after a data wipe). +# +# setprop ro.config.hosted_account username@hosteddomain.org:password +# setprop ro.config.google_account username@gmail.com:password +# +# You MUST have a Google account on the device, and you MAY +# additionally have a hosted account. No other configuration is +# supported, and arbitrary breakage may result if you specify +# something else. + +service goldfish-setup /system/etc/init.goldfish.sh + oneshot + +service qemud /system/bin/qemud + socket qemud stream 666 + oneshot + +# -Q is a special logcat option that forces the +# program to check wether it runs on the emulator +# if it does, it redirects its output to the device +# named by the androidboot.console kernel option +# if not, is simply exit immediately + +service goldfish-logcat /system/bin/logcat -Q + oneshot |