From de21059acf371a58019ef02aa79457923750aa79 Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Wed, 10 Sep 2014 15:10:31 -0700 Subject: [PATCH] Remove the vbox target from the build system. I've been told this is no longer in use, and it's the only user of external/grub, which is distressingly out of date. Change-Id: I434a55e0d68f6db97fa71e294e983ff1802e9ba6 --- envsetup.sh | 1 - target/board/vbox_x86/AndroidBoard.mk | 1 - target/board/vbox_x86/BoardConfig.mk | 40 ------------ target/board/vbox_x86/README.txt | 9 --- target/board/vbox_x86/device.mk | 36 ----------- target/board/vbox_x86/disk_layout.conf | 76 ---------------------- target/board/vbox_x86/init.vbox_x86.rc | 90 -------------------------- target/board/vbox_x86/system.prop | 6 -- target/product/AndroidProducts.mk | 1 - target/product/vbox_x86.mk | 36 ----------- 10 files changed, 296 deletions(-) delete mode 100644 target/board/vbox_x86/AndroidBoard.mk delete mode 100644 target/board/vbox_x86/BoardConfig.mk delete mode 100644 target/board/vbox_x86/README.txt delete mode 100644 target/board/vbox_x86/device.mk delete mode 100644 target/board/vbox_x86/disk_layout.conf delete mode 100644 target/board/vbox_x86/init.vbox_x86.rc delete mode 100644 target/board/vbox_x86/system.prop delete mode 100644 target/product/vbox_x86.mk diff --git a/envsetup.sh b/envsetup.sh index 2cd342cb7..2bba6262b 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -457,7 +457,6 @@ add_lunch_combo aosp_mips-eng add_lunch_combo aosp_mips64-eng add_lunch_combo aosp_x86-eng add_lunch_combo aosp_x86_64-eng -add_lunch_combo vbox_x86-eng function print_lunch_menu() { diff --git a/target/board/vbox_x86/AndroidBoard.mk b/target/board/vbox_x86/AndroidBoard.mk deleted file mode 100644 index 8b1378917..000000000 --- a/target/board/vbox_x86/AndroidBoard.mk +++ /dev/null @@ -1 +0,0 @@ - diff --git a/target/board/vbox_x86/BoardConfig.mk b/target/board/vbox_x86/BoardConfig.mk deleted file mode 100644 index e5a1d3e8f..000000000 --- a/target/board/vbox_x86/BoardConfig.mk +++ /dev/null @@ -1,40 +0,0 @@ -# -# IA target for VitualBox -# - -TARGET_ARCH=x86 -TARGET_COMPRESS_MODULE_SYMBOLS := false -TARGET_NO_RECOVERY := true -TARGET_HARDWARE_3D := false -BOARD_USES_GENERIC_AUDIO := true -USE_CAMERA_STUB := true -TARGET_CPU_ABI := x86 -TARGET_USERIMAGES_USE_EXT4 := true -TARGET_BOOTIMAGE_USE_EXT2 := true -BOARD_CACHEIMAGE_PARTITION_SIZE := 268435456 -BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4 - -# For VirtualBox and likely other emulators -BOARD_INSTALLER_CMDLINE := init=/init console=ttyS0 console=tty0 vga=788 verbose -BOARD_KERNEL_CMDLINE := init=/init qemu=1 console=tty0 vga=788 verbose androidboot.hardware=vbox_x86 androidboot.console=tty0 android.qemud=tty0 -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 -# 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 - -WITH_DEXPREOPT := false - -# The eth0 device should be started with dhcp on boot. -# Useful for emulators that don't provide a wifi connection. -NET_ETH0_STARTONBOOT := true - -ADDITIONAL_BUILD_PROPERTIES += dalvik.vm.heapsize=32m diff --git a/target/board/vbox_x86/README.txt b/target/board/vbox_x86/README.txt deleted file mode 100644 index 568dc5fc9..000000000 --- a/target/board/vbox_x86/README.txt +++ /dev/null @@ -1,9 +0,0 @@ -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 deleted file mode 100644 index a44a87faa..000000000 --- a/target/board/vbox_x86/device.mk +++ /dev/null @@ -1,36 +0,0 @@ -# -# 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. - -LOCAL_PATH := $(call my-dir) - -PRODUCT_PROPERTY_OVERRIDES := \ - ro.ril.hsxpa=1 \ - ro.ril.gprsclass=10 \ - ro.adb.qemud=1 - -LOCAL_KERNEL := prebuilts/qemu-kernel/x86/kernel-vbox - -PRODUCT_COPY_FILES := \ - device/generic/goldfish/data/etc/apns-conf.xml:system/etc/apns-conf.xml \ - device/generic/goldfish/camera/media_profiles.xml:system/etc/media_profiles.xml \ - device/generic/goldfish/camera/media_codecs.xml:system/etc/media_codecs.xml \ - build/target/board/vbox_x86/init.vbox_x86.rc:root/init.vbox_x86.rc \ - $(LOCAL_KERNEL):kernel - -$(call inherit-product, frameworks/native/build/phone-xhdpi-1024-dalvik-heap.mk) diff --git a/target/board/vbox_x86/disk_layout.conf b/target/board/vbox_x86/disk_layout.conf deleted file mode 100644 index 12241ab46..000000000 --- a/target/board/vbox_x86/disk_layout.conf +++ /dev/null @@ -1,76 +0,0 @@ -# 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.vbox_x86.rc b/target/board/vbox_x86/init.vbox_x86.rc deleted file mode 100644 index 15ca572aa..000000000 --- a/target/board/vbox_x86/init.vbox_x86.rc +++ /dev/null @@ -1,90 +0,0 @@ -on early-init - export EXTERNAL_STORAGE /mnt/sdcard - mkdir /mnt/sdcard 0000 system system - # for backwards compatibility - symlink /mnt/sdcard /sdcard - -on boot - setprop ARGH ARGH - setprop net.eth0.gw 10.0.2.2 - 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 - -# start essential services - start qemud - start goldfish-logcat -# start goldfish-setup - start netcfg - - setprop ro.setupwizard.mode EMULATOR - -on fs -# mount sda (system) and sdb (data) partitions - mount ext4 /dev/block/sda6 /system - mount ext4 /dev/block/sda6 /system ro remount - mount ext4 /dev/block/sdb6 /data nosuid nodev - mount ext4 /dev/block/sdb7 /cache nosuid nodev - -# 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 - user root - group root - oneshot - -# The qemu-props program is used to set various system -# properties on boot. It must be run early during the boot -# process to avoid race conditions with other daemons that -# might read them (e.g. surface flinger), so define it in -# class 'core' -# -service qemu-props /system/bin/qemu-props - class core - user root - group root - 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, it simply exits immediately - -service goldfish-logcat /system/bin/logcat -Q - 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 deleted file mode 100644 index 137a0f9b1..000000000 --- a/target/board/vbox_x86/system.prop +++ /dev/null @@ -1,6 +0,0 @@ -# -# 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 a714f1fe1..97c5bda2b 100644 --- a/target/product/AndroidProducts.mk +++ b/target/product/AndroidProducts.mk @@ -59,7 +59,6 @@ PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/aosp_mips64.mk \ $(LOCAL_DIR)/aosp_x86_64.mk \ $(LOCAL_DIR)/full_x86_64.mk \ - $(LOCAL_DIR)/vbox_x86.mk \ $(LOCAL_DIR)/sdk.mk \ $(LOCAL_DIR)/sdk_x86.mk \ $(LOCAL_DIR)/sdk_mips.mk \ diff --git a/target/product/vbox_x86.mk b/target/product/vbox_x86.mk deleted file mode 100644 index a7d1b6580..000000000 --- a/target/product/vbox_x86.mk +++ /dev/null @@ -1,36 +0,0 @@ -# -# 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. -ifdef NET_ETH0_STARTONBOOT - PRODUCT_PROPERTY_OVERRIDES += net.eth0.startonboot=1 -endif - -$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base.mk) -$(call inherit-product, $(SRC_TARGET_DIR)/board/vbox_x86/device.mk) - -PRODUCT_PACKAGES += \ - camera.vbox_x86 \ - lights.vbox_x86 \ - gps.vbox_x86 \ - sensors.vbox_x86 - -PRODUCT_NAME := vbox_x86 -PRODUCT_DEVICE := vbox_x86 -PRODUCT_MODEL := Full Android on x86 VirtualBox