diff --git a/target/board/generic_x86/BoardConfig.mk b/target/board/generic_x86/BoardConfig.mk index 89fb5e4dc..7586db898 100644 --- a/target/board/generic_x86/BoardConfig.mk +++ b/target/board/generic_x86/BoardConfig.mk @@ -1,4 +1,5 @@ TARGET_ARCH=x86 +DISABLE_DEXPREOPT := true TARGET_COMPRESS_MODULE_SYMBOLS := false TARGET_PRELINK_MODULE := false TARGET_NO_RECOVERY := true @@ -19,3 +20,8 @@ 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 + + +# 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/generic_x86/README.txt b/target/board/generic_x86/README.txt index 97e2d5b80..585a373fa 100644 --- a/target/board/generic_x86/README.txt +++ b/target/board/generic_x86/README.txt @@ -8,15 +8,11 @@ A1. Create a new top level directory and pull the AOSP repository repo init -u git://android.git.kernel.org/platform/manifest.git repo sync -A2. Copy in the buildspeck.mk - cd $HOME/AOSP - cp build/target/board/generic_x86/buildspec-generic_x86.mk buildspec.mk - -A3. Copy in the kernel +A2. Copy in the kernel cd $HOME/AOSP cp ~/bzImage.your_device $HOME/AOSP/prebuilt/android-x86/kernel/kernel -A4. Build +A3. Build cd $HOME/AOSP source build/envsetup.sh lunch generic_x86-eng @@ -25,7 +21,7 @@ A4. Build The build will generate some image files whose format may or may not be correct for your device. You can build an installer image disk for the VirtualBox emulator using the command: -A5. Build a VirtualBox installer image +A4. Build a VirtualBox installer image cd $HOME/AOSP source build/envsetup.sh lunch generic_x86-eng diff --git a/target/board/generic_x86/buildspec-generic_x86.mk b/target/board/generic_x86/buildspec-generic_x86.mk deleted file mode 100644 index fbc3947b3..000000000 --- a/target/board/generic_x86/buildspec-generic_x86.mk +++ /dev/null @@ -1,7 +0,0 @@ -BUILD_ENV_SEQUENCE_NUMBER := 9 -DISABLE_DEXPREOPT := true -TARGET_ARCH := x86 - -# The eth0 device should be started with dhcp on boot. -# Useful for emulators that don't provide a wifi connection. -NET_ETH0_STARTONBOOT := true