diff options
| -rw-r--r-- | envsetup.sh | 1 | ||||
| -rw-r--r-- | target/board/vbox_x86/AndroidBoard.mk | 7 | ||||
| -rw-r--r-- | target/board/vbox_x86/BoardConfig.mk | 35 | ||||
| -rw-r--r-- | target/board/vbox_x86/README.txt | 9 | ||||
| -rw-r--r-- | target/board/vbox_x86/device.mk | 26 | ||||
| -rw-r--r-- | target/board/vbox_x86/disk_layout.conf | 76 | ||||
| -rw-r--r-- | target/board/vbox_x86/init.rc | 426 | ||||
| -rw-r--r-- | target/board/vbox_x86/system.prop | 6 | ||||
| -rw-r--r-- | target/product/AndroidProducts.mk | 1 | ||||
| -rw-r--r-- | target/product/vbox_x86.mk | 26 |
10 files changed, 613 insertions, 0 deletions
diff --git a/envsetup.sh b/envsetup.sh index 8289c82..7ca0e3a 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -431,6 +431,7 @@ function add_lunch_combo() # add the default one here add_lunch_combo full-eng add_lunch_combo full_x86-eng +add_lunch_combo vbox_x86-eng # if we're on linux, add the simulator. There is a special case # in lunch to deal with the simulator diff --git a/target/board/vbox_x86/AndroidBoard.mk b/target/board/vbox_x86/AndroidBoard.mk new file mode 100644 index 0000000..2af7dcd --- /dev/null +++ b/target/board/vbox_x86/AndroidBoard.mk @@ -0,0 +1,7 @@ +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 new file mode 100644 index 0000000..525074e --- /dev/null +++ b/target/board/vbox_x86/BoardConfig.mk @@ -0,0 +1,35 @@ +# +# IA target for VitualBox +# + +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 +USE_CAMERA_STUB := true +TARGET_PROVIDES_INIT_RC := true +USE_CUSTOM_RUNTIME_HEAP_MAX := "32M" +TARGET_CPU_ABI := x86 +TARGET_USERIMAGES_USE_EXT4 := true +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 +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 +TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true + + +# 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/vbox_x86/README.txt b/target/board/vbox_x86/README.txt new file mode 100644 index 0000000..568dc5f --- /dev/null +++ b/target/board/vbox_x86/README.txt @@ -0,0 +1,9 @@ +The "vbox_x86" product defines a non-hardware-specific target intended +to run on the VirtualBox emulator. + +Most of the Android devices (networking, phones, sound, etc) do not work. + +ADB via ethernet works with this target. You can use 'adb install' to +test applications that do not require network, phone or sound support. +This emulation is useful because VirtualBox runs much faster then does the +QEMU emulators (at least until a KVM enabled QEMU emulator is available). diff --git a/target/board/vbox_x86/device.mk b/target/board/vbox_x86/device.mk new file mode 100644 index 0000000..0b4dc27 --- /dev/null +++ b/target/board/vbox_x86/device.mk @@ -0,0 +1,26 @@ +# +# Copyright (C) 2009 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# This is a build configuration for the product aspects that +# are specific to the emulator. + +PRODUCT_PROPERTY_OVERRIDES := \ + ro.ril.hsxpa=1 \ + ro.ril.gprsclass=10 + +PRODUCT_COPY_FILES := \ + development/data/etc/apns-conf.xml:system/etc/apns-conf.xml \ + development/data/etc/vold.conf:system/etc/vold.conf diff --git a/target/board/vbox_x86/disk_layout.conf b/target/board/vbox_x86/disk_layout.conf new file mode 100644 index 0000000..12241ab --- /dev/null +++ b/target/board/vbox_x86/disk_layout.conf @@ -0,0 +1,76 @@ +# Best to align all partion start/ends on a cylinder boundary (fdisk prefers it) +# 512 bytes/sector +# 63 sectors/track +# 32 tracks/cylinder + +# LBAs are in 'k', so... +# 1008 blocks (1k each) (1032192 bytes) / cylinder + +device { + + path /dev/block/sda + + scheme mbr + + # bytes in a disk sector (== 1 LBA), must be a power of 2! + sector_size 512 + + # Start_lba should be on a cylindar boundary. + start_lba 63 + + # Autodetect disk size if == 0 + num_lba 0 + + partitions { + # /dev/sdX1 + sysloader { + active y + type linux + # 8 cyls in length... about 8M + len 8064 + } + + # /dev/sdX2 + recovery { + active y + type linux + # 8 cyls in length... about 8M + len 8064 + } + + # /dev/sdX3 + boot { + active y + type linux + # 8 cyls in length... about 8M + len 8064 + } + + # /dev/sdX4 + # (extended partion begins) + + # /dev/sdX5 + cache { + type linux + len 512M + } + + # /dev/sdX6 + system { + type linux + len 512M + } + + # /dev/sdX7 + third_party { + type linux + len 512M + } + + # /dev/sdX8 + data { + type linux + len -1 + } + } +} diff --git a/target/board/vbox_x86/init.rc b/target/board/vbox_x86/init.rc new file mode 100644 index 0000000..100cc09 --- /dev/null +++ b/target/board/vbox_x86/init.rc @@ -0,0 +1,426 @@ +on early-init + start ueventd + +on init + +sysclktz 0 + +loglevel 3 + +# setup the global environment + export PATH /sbin:/vendor/bin:/system/sbin:/system/bin:/system/xbin + export LD_LIBRARY_PATH /vendor/lib:/system/lib + export ANDROID_BOOTLOGO 1 + export ANDROID_ROOT /system + export ANDROID_ASSETS /system/app + export ANDROID_DATA /data + export EXTERNAL_STORAGE /mnt/sdcard + export ASEC_MOUNTPOINT /mnt/asec + export LOOP_MOUNTPOINT /mnt/obb + export BOOTCLASSPATH /system/framework/core.jar:/system/framework/bouncycastle.jar:/system/framework/ext.jar:/system/framework/framework.jar:/system/framework/android.policy.jar:/system/framework/services.jar:/system/framework/core-junit.jar + +# Backward compatibility + symlink /system/etc /etc + symlink /sys/kernel/debug /d + +# Right now vendor lives on the same filesystem as system, +# but someday that may change. + symlink /system/vendor /vendor + +# create mountpoints + mkdir /mnt 0775 root system + mkdir /mnt/sdcard 0000 system system + +# Create cgroup mount point for cpu accounting + mkdir /acct + mount cgroup none /acct cpuacct + mkdir /acct/uid + +# Backwards Compat - XXX: Going away in G* + symlink /mnt/sdcard /sdcard + + mkdir /system + mkdir /data 0771 system system + mkdir /cache 0770 system cache + mkdir /config 0500 root root + + # Directory for putting things only root should see. + mkdir /mnt/secure 0700 root root + + # Directory for staging bindmounts + mkdir /mnt/secure/staging 0700 root root + + # Directory-target for where the secure container + # imagefile directory will be bind-mounted + mkdir /mnt/secure/asec 0700 root root + + # Secure container public mount points. + mkdir /mnt/asec 0700 root system + mount tmpfs tmpfs /mnt/asec mode=0755,gid=1000 + + # Filesystem image public mount points. + mkdir /mnt/obb 0700 root system + mount tmpfs tmpfs /mnt/obb mode=0755,gid=1000 + + write /proc/sys/kernel/panic_on_oops 1 + write /proc/sys/kernel/hung_task_timeout_secs 0 + write /proc/cpu/alignment 4 + write /proc/sys/kernel/sched_latency_ns 10000000 + write /proc/sys/kernel/sched_wakeup_granularity_ns 2000000 + write /proc/sys/kernel/sched_compat_yield 1 + write /proc/sys/kernel/sched_child_runs_first 0 + +# Create cgroup mount points for process groups + mkdir /dev/cpuctl + mount cgroup none /dev/cpuctl cpu + chown system system /dev/cpuctl + chown system system /dev/cpuctl/tasks + chmod 0777 /dev/cpuctl/tasks + write /dev/cpuctl/cpu.shares 1024 + + mkdir /dev/cpuctl/fg_boost + chown system system /dev/cpuctl/fg_boost/tasks + chmod 0777 /dev/cpuctl/fg_boost/tasks + write /dev/cpuctl/fg_boost/cpu.shares 1024 + + mkdir /dev/cpuctl/bg_non_interactive + chown system system /dev/cpuctl/bg_non_interactive/tasks + chmod 0777 /dev/cpuctl/bg_non_interactive/tasks + # 5.0 % + write /dev/cpuctl/bg_non_interactive/cpu.shares 52 + +on fs +# mount sda partitions + mount ext4 /dev/block/sda6 /system + mount ext4 /dev/block/sda6 /system ro remount + mount ext4 /dev/block/sda7 /data nosuid nodev + mount ext4 /dev/block/sda8 /cache nosuid nodev + +on post-fs + # once everything is setup, no need to modify / + mount rootfs rootfs / ro remount + + # We chown/chmod /data again so because mount is run as root + defaults + chown system system /data + chmod 0771 /data + + # Create dump dir and collect dumps. + # Do this before we mount cache so eventually we can use cache for + # storing dumps on platforms which do not have a dedicated dump partition. + + mkdir /data/dontpanic + chown root log /data/dontpanic + chmod 0750 /data/dontpanic + + # Collect apanic data, free resources and re-arm trigger + copy /proc/apanic_console /data/dontpanic/apanic_console + chown root log /data/dontpanic/apanic_console + chmod 0640 /data/dontpanic/apanic_console + + copy /proc/apanic_threads /data/dontpanic/apanic_threads + chown root log /data/dontpanic/apanic_threads + chmod 0640 /data/dontpanic/apanic_threads + + write /proc/apanic_console 1 + + # Same reason as /data above + chown system cache /cache + chmod 0770 /cache + + # This may have been created by the recovery system with odd permissions + chown system cache /cache/recovery + chmod 0770 /cache/recovery + + #change permissions on vmallocinfo so we can grab it from bugreports + chown root log /proc/vmallocinfo + chmod 0440 /proc/vmallocinfo + + #change permissions on kmsg & sysrq-trigger so bugreports can grab kthread stacks + chown root system /proc/kmsg + chmod 0440 /proc/kmsg + chown root system /proc/sysrq-trigger + chmod 0220 /proc/sysrq-trigger + +# create basic filesystem structure + mkdir /data/misc 01771 system misc + mkdir /data/misc/bluetoothd 0770 bluetooth bluetooth + mkdir /data/misc/bluetooth 0770 system system + mkdir /data/misc/keystore 0700 keystore keystore + mkdir /data/misc/vpn 0770 system system + mkdir /data/misc/systemkeys 0700 system system + mkdir /data/misc/vpn/profiles 0770 system system + # give system access to wpa_supplicant.conf for backup and restore + mkdir /data/misc/wifi 0770 wifi wifi + chmod 0770 /data/misc/wifi + chmod 0660 /data/misc/wifi/wpa_supplicant.conf + mkdir /data/local 0771 shell shell + mkdir /data/local/tmp 0771 shell shell + mkdir /data/data 0771 system system + mkdir /data/app-private 0771 system system + mkdir /data/app 0771 system system + mkdir /data/property 0700 root root + + # create dalvik-cache and double-check the perms + mkdir /data/dalvik-cache 0771 system system + chown system system /data/dalvik-cache + chmod 0771 /data/dalvik-cache + + # create the lost+found directories, so as to enforce our permissions + mkdir /data/lost+found 0770 + mkdir /cache/lost+found 0770 + + # double check the perms, in case lost+found already exists, and set owner + chown root root /data/lost+found + chmod 0770 /data/lost+found + chown root root /cache/lost+found + chmod 0770 /cache/lost+found + + # create data/drm directory + mkdir /data/drm 0774 drm drm + chown drm drm /data/drm + chmod 0774 /data/drm + +on boot +# basic network init + ifup lo + hostname localhost + domainname localdomain + +# set RLIMIT_NICE to allow priorities from 19 to -20 + setrlimit 13 40 40 + +# Define the oom_adj values for the classes of processes that can be +# killed by the kernel. These are used in ActivityManagerService. + setprop ro.FOREGROUND_APP_ADJ 0 + setprop ro.VISIBLE_APP_ADJ 1 + setprop ro.PERCEPTIBLE_APP_ADJ 2 + setprop ro.HEAVY_WEIGHT_APP_ADJ 3 + setprop ro.SECONDARY_SERVER_ADJ 4 + setprop ro.BACKUP_APP_ADJ 5 + setprop ro.HOME_APP_ADJ 6 + setprop ro.HIDDEN_APP_MIN_ADJ 7 + setprop ro.EMPTY_APP_ADJ 15 + +# Define the memory thresholds at which the above process classes will +# be killed. These numbers are in pages (4k). + setprop ro.FOREGROUND_APP_MEM 2048 + setprop ro.VISIBLE_APP_MEM 3072 + setprop ro.PERCEPTIBLE_APP_MEM 4096 + setprop ro.HEAVY_WEIGHT_APP_MEM 4096 + setprop ro.SECONDARY_SERVER_MEM 6144 + setprop ro.BACKUP_APP_MEM 6144 + setprop ro.HOME_APP_MEM 6144 + setprop ro.HIDDEN_APP_MEM 7168 + setprop ro.EMPTY_APP_MEM 8192 + +# Write value must be consistent with the above properties. +# Note that the driver only supports 6 slots, so we have combined some of +# the classes into the same memory level; the associated processes of higher +# classes will still be killed first. + write /sys/module/lowmemorykiller/parameters/adj 0,1,2,4,7,15 + + write /proc/sys/vm/overcommit_memory 1 + write /proc/sys/vm/min_free_order_shift 4 + write /sys/module/lowmemorykiller/parameters/minfree 2048,3072,4096,6144,7168,8192 + + # Set init its forked children's oom_adj. + write /proc/1/oom_adj -16 + + # Tweak background writeout + write /proc/sys/vm/dirty_expire_centisecs 200 + write /proc/sys/vm/dirty_background_ratio 5 + + # Permissions for System Server and daemons. + chown radio system /sys/android_power/state + chown radio system /sys/android_power/request_state + chown radio system /sys/android_power/acquire_full_wake_lock + chown radio system /sys/android_power/acquire_partial_wake_lock + chown radio system /sys/android_power/release_wake_lock + chown radio system /sys/power/state + chown radio system /sys/power/wake_lock + chown radio system /sys/power/wake_unlock + chmod 0660 /sys/power/state + chmod 0660 /sys/power/wake_lock + chmod 0660 /sys/power/wake_unlock + chown system system /sys/class/timed_output/vibrator/enable + chown system system /sys/class/leds/keyboard-backlight/brightness + chown system system /sys/class/leds/lcd-backlight/brightness + chown system system /sys/class/leds/button-backlight/brightness + chown system system /sys/class/leds/jogball-backlight/brightness + chown system system /sys/class/leds/red/brightness + chown system system /sys/class/leds/green/brightness + chown system system /sys/class/leds/blue/brightness + chown system system /sys/class/leds/red/device/grpfreq + chown system system /sys/class/leds/red/device/grppwm + chown system system /sys/class/leds/red/device/blink + chown system system /sys/class/leds/red/brightness + chown system system /sys/class/leds/green/brightness + chown system system /sys/class/leds/blue/brightness + chown system system /sys/class/leds/red/device/grpfreq + chown system system /sys/class/leds/red/device/grppwm + chown system system /sys/class/leds/red/device/blink + chown system system /sys/class/timed_output/vibrator/enable + chown system system /sys/module/sco/parameters/disable_esco + chown system system /sys/kernel/ipv4/tcp_wmem_min + chown system system /sys/kernel/ipv4/tcp_wmem_def + chown system system /sys/kernel/ipv4/tcp_wmem_max + chown system system /sys/kernel/ipv4/tcp_rmem_min + chown system system /sys/kernel/ipv4/tcp_rmem_def + chown system system /sys/kernel/ipv4/tcp_rmem_max + chown root radio /proc/cmdline + +# Define TCP buffer sizes for various networks +# ReadMin, ReadInitial, ReadMax, WriteMin, WriteInitial, WriteMax, + setprop net.tcp.buffersize.default 4096,87380,110208,4096,16384,110208 + setprop net.tcp.buffersize.wifi 4095,87380,110208,4096,16384,110208 + setprop net.tcp.buffersize.umts 4094,87380,110208,4096,16384,110208 + setprop net.tcp.buffersize.edge 4093,26280,35040,4096,16384,35040 + setprop net.tcp.buffersize.gprs 4092,8760,11680,4096,8760,11680 + + class_start default + +## Daemon processes to be run by init. +## +service ueventd /sbin/ueventd + critical + +service console /system/bin/sh + console + disabled + user shell + group log + +on property:ro.secure=0 + start console + +# adbd is controlled by the persist.service.adb.enable system property +service adbd /sbin/adbd + disabled + +# adbd on at boot in emulator +on property:ro.kernel.qemu=1 + start adbd + +on property:persist.service.adb.enable=1 + start adbd + +on property:persist.service.adb.enable=0 + stop adbd + +service servicemanager /system/bin/servicemanager + user system + critical + onrestart restart zygote + onrestart restart media + +service vold /system/bin/vold + socket vold stream 0660 root mount + ioprio be 2 + +service netd /system/bin/netd + socket netd stream 0660 root system + socket dnsproxyd stream 0660 root inet + +service debuggerd /system/bin/debuggerd + +service ril-daemon /system/bin/rild + socket rild stream 660 root radio + socket rild-debug stream 660 radio system + user root + group radio cache inet misc audio sdcard_rw + +service zygote /system/bin/app_process -Xzygote /system/bin --zygote --start-system-server + socket zygote stream 666 + onrestart write /sys/android_power/request_state wake + onrestart write /sys/power/state on + onrestart restart media + onrestart restart netd + +service drm /system/bin/drmserver + user drm + group system root inet + +service drmio /system/bin/drmioserver + user drmio + +service media /system/bin/mediaserver + user media + group system audio camera graphics inet net_bt net_bt_admin net_raw + ioprio rt 4 + +service bootanim /system/bin/bootanimation + user graphics + group graphics + disabled + oneshot + +service dbus /system/bin/dbus-daemon --system --nofork + socket dbus stream 660 bluetooth bluetooth + user bluetooth + group bluetooth net_bt_admin + +service bluetoothd /system/bin/bluetoothd -n + socket bluetooth stream 660 bluetooth bluetooth + socket dbus_bluetooth stream 660 bluetooth bluetooth + # init.rc does not yet support applying capabilities, so run as root and + # let bluetoothd drop uid to bluetooth with the right linux capabilities + group bluetooth net_bt_admin misc + disabled + +service hfag /system/bin/sdptool add --channel=10 HFAG + user bluetooth + group bluetooth net_bt_admin + disabled + oneshot + +service hsag /system/bin/sdptool add --channel=11 HSAG + user bluetooth + group bluetooth net_bt_admin + disabled + oneshot + +service opush /system/bin/sdptool add --channel=12 OPUSH + user bluetooth + group bluetooth net_bt_admin + disabled + oneshot + +service pbap /system/bin/sdptool add --channel=19 PBAP + user bluetooth + group bluetooth net_bt_admin + disabled + oneshot + +service installd /system/bin/installd + socket installd stream 600 system system + +service flash_recovery /system/etc/install-recovery.sh + oneshot + +service racoon /system/bin/racoon + socket racoon stream 600 system system + # racoon will setuid to vpn after getting necessary resources. + group net_admin + disabled + oneshot + +service mtpd /system/bin/mtpd + socket mtpd stream 600 system system + user vpn + group vpn net_admin net_raw + disabled + oneshot + +service keystore /system/bin/keystore /data/misc/keystore + user keystore + group keystore + socket keystore stream 666 + +service dumpstate /system/bin/dumpstate -s + socket dumpstate stream 0660 shell log + disabled + oneshot + +# Enable networking so that adb can connect +service netcfg /system/bin/netcfg eth0 dhcp + oneshot diff --git a/target/board/vbox_x86/system.prop b/target/board/vbox_x86/system.prop new file mode 100644 index 0000000..137a0f9 --- /dev/null +++ b/target/board/vbox_x86/system.prop @@ -0,0 +1,6 @@ +# +# system.prop for generic sdk +# + +rild.libpath=/system/lib/libreference-ril.so +rild.libargs=-d /dev/ttyS0 diff --git a/target/product/AndroidProducts.mk b/target/product/AndroidProducts.mk index 32416c5..56858e1 100644 --- a/target/product/AndroidProducts.mk +++ b/target/product/AndroidProducts.mk @@ -38,6 +38,7 @@ PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/generic_x86.mk \ $(LOCAL_DIR)/full.mk \ $(LOCAL_DIR)/full_x86.mk \ + $(LOCAL_DIR)/vbox_x86.mk \ $(LOCAL_DIR)/sdk.mk \ $(LOCAL_DIR)/sim.mk endif diff --git a/target/product/vbox_x86.mk b/target/product/vbox_x86.mk new file mode 100644 index 0000000..c32b1eb --- /dev/null +++ b/target/product/vbox_x86.mk @@ -0,0 +1,26 @@ +# +# Copyright (C) 2009 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# This is a build configuration for a full-featured build of the +# 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. + +$(call inherit-product, $(SRC_TARGET_DIR)/product/full_x86.mk) + +PRODUCT_NAME := vbox_x86 +PRODUCT_DEVICE := vbox_x86 +PRODUCT_MODEL := Full Android on x86 VirtualBox |