From cce6f923aaa84932d00b90f56ab3ef9a950dd949 Mon Sep 17 00:00:00 2001 From: Bruce Beare Date: Mon, 12 Jul 2010 11:32:37 -0700 Subject: Move buildspec vars to BoardConfig.mk Change-Id: I48ed4b55e91aae51076d9c609b44bf9fa24c3ecd Signed-off-by: Bruce Beare --- target/board/generic_x86/BoardConfig.mk | 6 ++++++ target/board/generic_x86/README.txt | 10 +++------- target/board/generic_x86/buildspec-generic_x86.mk | 7 ------- 3 files changed, 9 insertions(+), 14 deletions(-) delete mode 100644 target/board/generic_x86/buildspec-generic_x86.mk (limited to 'target') diff --git a/target/board/generic_x86/BoardConfig.mk b/target/board/generic_x86/BoardConfig.mk index 89fb5e4..7586db8 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 97e2d5b..585a373 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 fbc3947..0000000 --- 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 -- cgit v1.1