Merge "Move devtools prebuilts out of prebuilt/"
diff --git a/x86/pc-bios/Android.mk b/x86/pc-bios/Android.mk
new file mode 100644
index 0000000..9c99865
--- /dev/null
+++ b/x86/pc-bios/Android.mk
@@ -0,0 +1,35 @@
+#
+# Copyright (C) 2011 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.
+#
+LOCAL_PATH := $(my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := bios.bin
+LOCAL_SRC_FILES := $(LOCAL_MODULE)
+LOCAL_IS_HOST_MODULE := true
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := EXECUTABLES
+LOCAL_MODULE_PATH := $(HOST_OUT)/usr/share/pc-bios
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := vgabios-cirrus.bin
+LOCAL_SRC_FILES := $(LOCAL_MODULE)
+LOCAL_IS_HOST_MODULE := true
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := EXECUTABLES
+LOCAL_MODULE_PATH := $(HOST_OUT)/usr/share/pc-bios
+include $(BUILD_PREBUILT)
+
diff --git a/x86/pc-bios/bios.bin b/x86/pc-bios/bios.bin
new file mode 100644
index 0000000..ed9b8f7
--- /dev/null
+++ b/x86/pc-bios/bios.bin
Binary files differ
diff --git a/x86/pc-bios/vgabios-cirrus.bin b/x86/pc-bios/vgabios-cirrus.bin
new file mode 100644
index 0000000..d32ec21
--- /dev/null
+++ b/x86/pc-bios/vgabios-cirrus.bin
Binary files differ
