diff options
author | Bruce Beare <bruce.j.beare@intel.com> | 2011-03-22 09:04:03 -0700 |
---|---|---|
committer | Bruce Beare <bruce.j.beare@intel.com> | 2011-03-22 09:04:03 -0700 |
commit | 8d88273362aebc955793eaa291cce5e47bc25706 (patch) | |
tree | 883b0dfe85c88de22bf83c45693244969b9edb4b /build/tools.atree | |
parent | 54db46554cffd07979b13e344860e96ebe382b12 (diff) | |
download | sdk-8d88273362aebc955793eaa291cce5e47bc25706.zip sdk-8d88273362aebc955793eaa291cce5e47bc25706.tar.gz sdk-8d88273362aebc955793eaa291cce5e47bc25706.tar.bz2 |
Revert "DISABLED 2 lines that break the SDK build (bios.bin in sdk/tools.atree)"
This reverts commit 147e8b73aefa28ef599628c718060450539b6102.
The original commit was merged out of sequence - thus the need for the
original revert. All dependent commits are now complete so we can put back
in place the original change.
Diffstat (limited to 'build/tools.atree')
-rw-r--r-- | build/tools.atree | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/build/tools.atree b/build/tools.atree index 1e3f722..db3367c 100644 --- a/build/tools.atree +++ b/build/tools.atree @@ -43,9 +43,8 @@ bin/zipalign tools/zipalign bin/emulator tools/emulator-arm bin/emulator-x86 tools/emulator-x86 sdk/emulator/snapshot/snapshots.img tools/lib/emulator/snapshots.img -# DISABLED 2 lines that break the build: sdk/build/tools.atree:46: couldn't locate source file:... -#usr/share/pc-bios/bios.bin tools/lib/pc-bios/bios.bin -#usr/share/pc-bios/vgabios-cirrus.bin tools/lib/pc-bios/vgabios-cirrus.bin +usr/share/pc-bios/bios.bin tools/lib/pc-bios/bios.bin +usr/share/pc-bios/vgabios-cirrus.bin tools/lib/pc-bios/vgabios-cirrus.bin # Java-Based SDK Tools bin/ddms tools/ddms |