Merge "Share common AndroidBoard files between dream and sapphire"

9 files changed, 1 insertions, 91 deletions

diff --git a/AndroidBoard.mk b/AndroidBoard.mk
index b041416..aa5a312 100644
--- a/AndroidBoard.mk
+++ b/AndroidBoard.mk
@@ -14,51 +14,22 @@
 
 LOCAL_PATH := $(call my-dir)
 
-ifeq ($(TARGET_PREBUILT_KERNEL),)
-TARGET_PREBUILT_KERNEL := $(LOCAL_PATH)/kernel
-endif
-
-file := $(INSTALLED_KERNEL_TARGET)
-ALL_PREBUILT += $(file)
-$(file): $(TARGET_PREBUILT_KERNEL) | $(ACP)
-	$(transform-prebuilt-to-target)
-
 $(call add-radio-file,recovery/images/firmware_install.565)
-$(call add-radio-file,recovery/images/firmware_error.565)
-$(call add-radio-file,recovery/images/bitmap_size.txt)
 
 file := $(TARGET_OUT_KEYLAYOUT)/sapphire-keypad.kl
 ALL_PREBUILT += $(file)
 $(file) : $(LOCAL_PATH)/sapphire-keypad.kl | $(ACP)
 	$(transform-prebuilt-to-target)
 
-file := $(TARGET_OUT_KEYLAYOUT)/h2w_headset.kl
-ALL_PREBUILT += $(file)
-$(file) : $(LOCAL_PATH)/h2w_headset.kl | $(ACP)
-	$(transform-prebuilt-to-target)
-
 file := $(TARGET_ROOT_OUT)/init.sapphire.rc
 ALL_PREBUILT += $(file)
 $(file) : $(LOCAL_PATH)/init.sapphire.rc | $(ACP)
 	$(transform-prebuilt-to-target)
 
-
 include $(CLEAR_VARS)
 LOCAL_SRC_FILES := sapphire-keypad.kcm
 include $(BUILD_KEY_CHAR_MAP)
 
-include $(CLEAR_VARS)
-LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE := vold.fstab
-LOCAL_SRC_FILES := $(LOCAL_MODULE)
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := wlan.ko
-LOCAL_MODULE_TAGS := user
-LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/modules
-LOCAL_SRC_FILES := $(LOCAL_MODULE)
-include $(BUILD_PREBUILT)
+include device/htc/dream-sapphire/AndroidBoardCommon.mk
 
 -include vendor/htc/sapphire/AndroidBoardVendor.mk
diff --git a/h2w_headset.kl b/h2w_headset.kl
deleted file mode 100644
index 14f4382..0000000
--- a/h2w_headset.kl
+++ /dev/null
@@ -1,9 +0,0 @@
-key 107   ENDCALL           WAKE_DROPPED
-key 113   MUTE
-key 114   VOLUME_DOWN
-key 115   VOLUME_UP
-key 163   MEDIA_NEXT
-key 164   MEDIA_PLAY_PAUSE
-key 165   MEDIA_PREVIOUS
-key 226   HEADSETHOOK       WAKE
-key 231   CALL              WAKE_DROPPED
diff --git a/kernel b/kernel
deleted file mode 100644
index 770909d..0000000
--- a/kernel
+++ /dev/null
diff --git a/recovery/images/README b/recovery/images/README
deleted file mode 100644
index 9447250..0000000
--- a/recovery/images/README
+++ /dev/null
@@ -1,18 +0,0 @@
-This directory contains the firmware_install.565 and
-firmware_error.565 bitmaps shown when installing a radio or hboot
-update via OTA on this device.
-
-They were generated from the corresponding .png files by doing:
-
-  convert -gravity center -extent 320x480 -background black -depth 8 icon_firmware_install.png temp.rgb
-  rgb2565 -w 320 < temp.rgb > firmware_install.565
-
-  convert -gravity center -extent 320x480 -background black -depth 8 icon_firmware_error.png temp.rgb
-  rgb2565 -w 320 < temp.rgb > firmware_error.565
-
-(convert is part of ImageMagick; rgb2565 is built in the android
-source tree.)
-
-bitmap_size.txt contains the width, height, and depth of the bitmaps
-(320 x 480 x 16bpp).
-
diff --git a/recovery/images/bitmap_size.txt b/recovery/images/bitmap_size.txt
deleted file mode 100644
index 017e67a..0000000
--- a/recovery/images/bitmap_size.txt
+++ /dev/null
@@ -1 +0,0 @@
-320 480 16
diff --git a/recovery/images/firmware_error.565 b/recovery/images/firmware_error.565
deleted file mode 100644
index f6303ff..0000000
--- a/recovery/images/firmware_error.565
+++ /dev/null
diff --git a/recovery/images/icon_firmware_error.png b/recovery/images/icon_firmware_error.png
deleted file mode 100644
index 0c32c9e..0000000
--- a/recovery/images/icon_firmware_error.png
+++ /dev/null
diff --git a/vold.fstab b/vold.fstab
deleted file mode 100644
index a48b0ce..0000000
--- a/vold.fstab
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright (C) 2009 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.
-
-
-## Vold 2.0 fstab for HTC Dream or Sapphire
-#
-## - San Mehat (san@android.com)
-## 
-
-#######################
-## Regular device mount
-##
-## Format: dev_mount <label> <mount_point> <part> <sysfs_path1...> 
-## label        - Label for the volume
-## mount_point  - Where the volume will be mounted
-## part         - Partition # (1 based), or 'auto' for first usable partition.
-## <sysfs_path> - List of sysfs paths to source devices
-######################
-
-# Mounts the first usable partition of the specified device
-dev_mount sdcard /mnt/sdcard auto /devices/platform/goldfish_mmc.0 /devices/platform/msm_sdcc.2/mmc_host/mmc1
-
diff --git a/wlan.ko b/wlan.ko
deleted file mode 100644
index 602235b..0000000
--- a/wlan.ko
+++ /dev/null