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

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

am f9e275b0: merge from open-source master

Merge commit 'f9e275b0' into kraken

* commit 'f9e275b0':
  Add support for x86 VirtualBox Emulation
parents ea4b1a86 f9e275b0
Loading
Loading
Loading
Loading
+9 −0
Original line number Diff line number Diff line
@@ -6,3 +6,12 @@ LOCAL_SRC_FILES := init.rc
LOCAL_MODULE_CLASS := SHARED_LIBRARIES
LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)
include $(BUILD_PREBUILT)

ifeq ($(TARGET_PREBUILT_KERNEL),)
LOCAL_KERNEL := prebuilt/android-x86/kernel/kernel
else
LOCAL_KERNEL := $(TARGET_PREBUILT_KERNEL)
endif

PRODUCT_COPY_FILES += \
    $(LOCAL_KERNEL):kernel
+5 −7
Original line number Diff line number Diff line
@@ -9,12 +9,10 @@ USE_CUSTOM_RUNTIME_HEAP_MAX := "32M"
TARGET_CPU_ABI := x86
TARGET_USERIMAGES_USE_EXT2 := true
TARGET_BOOTIMAGE_USE_EXT2 := true
TARGET_USE_DISKINSTALLER := false

# For KVM
# BOARD_KERNEL_CMDLINE := console=tty0 console=ttyS1,115200n8 console=tty0 androidboot.hardware=generic_x86 vga=788

# For mrst_ref
BOARD_KERNEL_CMDLINE := init=/init pci=noearly console=ttyS0 console=ttyS1,115200n8 console=tty0 earlyprintk=mrst loglevel=8 notsc no_percpu_apbt androidboot.hardware=generic_x86 s0ix_latency=160

BOARD_KERNEL_CMDLINE := init=/init console=tty0 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
BOARD_SYSLOADER_MAX_SIZE := 7340032
BOARD_FLASH_BLOCK_SIZE := 512
+11 −4
Original line number Diff line number Diff line
The generic_x86 board target provides basic services on
very basic hardware. To build with generic_x86, you will
need an appropriate kernel for your device (or emulation).
The generic_x86 board target provides basic services on very basic
hardware (really for an emulation). To build with generic_x86, you will
need an appropriate kernel for your emulation (or device).

A1. Create a new top level directory and pull the AOSP repository
        mkdir $HOME/AOSP
@@ -23,4 +23,11 @@ A4. Build
        make -j8

The build will generate some image files whose format may or may not be correct for your
device.
device. You can build an installer image disk for the VirtualBox emulator using the command:

A5. Build a VirtualBox installer image
	cd $HOME/AOSP
        source build/envsetup.sh
        lunch generic_x86-eng
        make -j8 installer_vdi
+54 −0
Original line number Diff line number Diff line
device {
    path /dev/block/sda

    scheme mbr

    # bytes in a disk sector (== 1 LBA), must be a power of 2!
    sector_size 512

    # What LBA should the partitions start at?
    start_lba 2048

    # Autodetect disk size if == 0
    num_lba 0

    partitions {
        sysloader {
            active y
            type linux
            len 7M
        }

        recovery {
            active y
            type linux
            len 16M
        }

        boot {
            active y
            type linux
            len 8M
        }

        cache {
            type linux
            len 512M
        }

        system {
            type linux
            len 512M
        }

        third_party {
            type linux
            len 512M
        }

        data {
            type linux
            len -1
        }
    }
}