Cleanup to better match the reference structure

2 files changed, 81 insertions, 304 deletions

diff --git a/AndroidBoard.mk b/AndroidBoard.mk
index 3c8dfa8..f9443bc 100644
--- a/AndroidBoard.mk
+++ b/AndroidBoard.mk
@@ -1,7 +1,5 @@
 LOCAL_PATH := $(call my-dir)
 
-# kernel binary
-#
 ifeq ($(TARGET_PREBUILT_KERNEL),)
 TARGET_PREBUILT_KERNEL := $(LOCAL_PATH)/kernel
 endif
@@ -11,22 +9,51 @@ ALL_PREBUILT += $(file)
 $(file): $(TARGET_PREBUILT_KERNEL) | $(ACP)
 	$(transform-prebuilt-to-target)
 
-# keyboard layouts
-#
-PRODUCT_COPY_FILES += \
-	$(LOCAL_PATH)/trout-keypad-v3.kl:system/usr/keylayout/trout-keypad.kl \
-	$(LOCAL_PATH)/trout-keypad-v3.kl:system/usr/keylayout/trout-keypad-v2.kl \
-	$(LOCAL_PATH)/trout-keypad-v3.kl:system/usr/keylayout/trout-keypad-v3.kl \
-	$(LOCAL_PATH)/trout-keypad-qwertz.kl:system/usr/keylayout/trout-keypad-qwertz.kl \
-	$(LOCAL_PATH)/h2w_headset.kl:system/usr/keylayout/h2w_headset.kl
+file := $(TARGET_OUT)/lib/libhtc_ril.so
+ALL_PREBUILT += $(file)
+$(file) : $(LOCAL_PATH)/proprietary/libhtc_ril.so | $(ACP)
+	$(transform-prebuilt-to-target)
 
-# default apns list
-#
-PRODUCT_COPY_FILES += \
-	$(LOCAL_PATH)/apns.xml:system/etc/apns-conf.xml
+file := $(TARGET_OUT)/lib/libhtc_acoustic.so
+ALL_PREBUILT += $(file)
+$(file) : $(LOCAL_PATH)/proprietary/libhtc_acoustic.so | $(ACP)
+	$(transform-prebuilt-to-target)
+
+file := $(TARGET_OUT_KEYLAYOUT)/trout-keypad.kl
+ALL_PREBUILT += $(file)
+$(file) : $(LOCAL_PATH)/trout-keypad.kl | $(ACP)
+	$(transform-prebuilt-to-target)
+
+file := $(TARGET_OUT_KEYLAYOUT)/trout-keypad-v2.kl
+ALL_PREBUILT += $(file)
+$(file) : $(LOCAL_PATH)/trout-keypad-v2.kl | $(ACP)
+	$(transform-prebuilt-to-target)
+
+file := $(TARGET_OUT_KEYLAYOUT)/trout-keypad-v3.kl
+ALL_PREBUILT += $(file)
+$(file) : $(LOCAL_PATH)/trout-keypad-v3.kl | $(ACP)
+	$(transform-prebuilt-to-target)
+
+file := $(TARGET_OUT_KEYLAYOUT)/trout-keypad-qwertz.kl
+ALL_PREBUILT += $(file)
+$(file) : $(LOCAL_PATH)/trout-keypad-qwertz.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_OUT)/etc/firmware/brf6300.bin
+ALL_PREBUILT += $(file)
+$(file) : $(LOCAL_PATH)/proprietary/brf6300.bin | $(ACP)
+	$(transform-prebuilt-to-target)
+
+file := $(TARGET_ROOT_OUT)/init.trout.rc
+ALL_PREBUILT += $(file)
+$(file) : $(LOCAL_PATH)/init.trout.rc | $(ACP)
+	$(transform-prebuilt-to-target)
 
-# keyboard maps
-#
 include $(CLEAR_VARS)
 LOCAL_SRC_FILES := trout-keypad.kcm
 include $(BUILD_KEY_CHAR_MAP)
@@ -43,33 +70,48 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := trout-keypad-qwertz.kcm
 include $(BUILD_KEY_CHAR_MAP)
 
-# board specific init.rc
+# This will install the file in /system/etc
 #
-PRODUCT_COPY_FILES += \
-	$(LOCAL_PATH)/init.trout.rc:root/init.trout.rc
+include $(CLEAR_VARS)
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE := AudioFilter.csv
+LOCAL_SRC_FILES := proprietary/$(LOCAL_MODULE)
+include $(BUILD_PREBUILT)
 
-# prebuilt wifi driver
-#
-PRODUCT_COPY_FILES += \
-	$(LOCAL_PATH)/wlan.ko:system/lib/modules/wlan.ko
+include $(CLEAR_VARS)
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE := AudioPreProcess.csv
+LOCAL_SRC_FILES := proprietary/$(LOCAL_MODULE)
+include $(BUILD_PREBUILT)
 
-# vold.conf
-#
-#
-PRODUCT_COPY_FILES += \
-	$(LOCAL_PATH)/vold.conf:system/etc/vold.conf
+include $(CLEAR_VARS)
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE := vold.conf
+LOCAL_SRC_FILES := $(LOCAL_MODULE)
+include $(BUILD_PREBUILT)
+
+# WiFi driver and firmware
+local_target_dir := $(TARGET_OUT_ETC)/wifi
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := Fw1251r1c.bin
+LOCAL_MODULE_TAGS := user
+LOCAL_MODULE_CLASS := ETC
+LOCAL_MODULE_PATH := $(local_target_dir)
+LOCAL_SRC_FILES := proprietary/$(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)
 
-# htc proprietary code
-#
 PRODUCT_COPY_FILES += \
-	$(LOCAL_PATH)/proprietary/AudioFilter.csv:system/etc/AudioFilter.csv \
-	$(LOCAL_PATH)/proprietary/AudioPara4.csv:system/etc/AudioPara4.csv \
-	$(LOCAL_PATH)/proprietary/AudioPreProcess.csv:system/etc/AudioPreProcess.csv \
-	$(LOCAL_PATH)/proprietary/brf6300.bin:system/etc/firmware/brf6300.bin \
-	$(LOCAL_PATH)/proprietary/gps.conf:system/etc/gps.conf \
-	$(LOCAL_PATH)/proprietary/Fw1251r1c.bin:system/etc/wifi/Fw1251r1c.bin
+	$(LOCAL_PATH)/proprietary/sensors.trout.so:system/lib/hw/sensors.trout.so
 
 PRODUCT_COPY_FILES += \
-	$(LOCAL_PATH)/proprietary/sensors.trout.so:system/lib/hw/sensors.trout.so \
-	$(LOCAL_PATH)/proprietary/libhtc_acoustic.so:system/lib/libhtc_acoustic.so \
-	$(LOCAL_PATH)/proprietary/libhtc_ril.so:system/lib/libhtc_ril.so
+	$(LOCAL_PATH)/proprietary/AudioPara4.csv:system/etc/AudioPara4.csv \
+	$(LOCAL_PATH)/proprietary/gps.conf:system/etc/gps.conf
diff --git a/apns.xml b/apns.xml
deleted file mode 100644
index cf1eaa4..0000000
--- a/apns.xml
+++ /dev/null
@@ -1,265 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 2006, Google Inc.
-**
-** 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.
-*/
--->
-
-<!-- use empty string to specify no proxy or port -->
-<!-- This version must agree with that in apps/common/res/apns.xml -->
-<apns version="6">
-    <apn carrier="T-Mobile US"
-         mcc="310"
-         mnc="260"
-         apn="epc.tmobile.com"
-         user="none"
-         server="*"
-         password="none"
-         mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
-    />
-
-    <apn carrier="T-Mobile US 250"
-         mcc="310"
-         mnc="250"
-         apn="epc.tmobile.com"
-         user="none"
-         server="*"
-         password="none"
-         mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
-            />
-
-    <apn carrier="T-Mobile US 660"
-         mcc="310"
-         mnc="660"
-         apn="epc.tmobile.com"
-         user="none"
-         server="*"
-         password="none"
-         mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
-            />
-
-    <apn carrier="T-Mobile US 230"
-         mcc="310"
-         mnc="230"
-         apn="epc.tmobile.com"
-         user="none"
-         server="*"
-         password="none"
-         mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
-            />
-
-    <apn carrier="T-Mobile US 310"
-         mcc="310"
-         mnc="310"
-         apn="epc.tmobile.com"
-         user="none"
-         server="*"
-         password="none"
-         mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
-            />
-
-    <apn carrier="T-Mobile US 580"
-         mcc="310"
-         mnc="580"
-         apn="epc.tmobile.com"
-         user="none"
-         server="*"
-         password="none"
-         mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
-            />
-
-    <apn carrier="T-Mobile US 240"
-         mcc="310"
-         mnc="240"
-         apn="epc.tmobile.com"
-         user="none"
-         server="*"
-         password="none"
-         mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
-            />
-
-    <apn carrier="T-Mobile US 800"
-         mcc="310"
-         mnc="800"
-         apn="epc.tmobile.com"
-         user="none"
-         server="*"
-         password="none"
-         mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
-            />
-
-    <apn carrier="T-Mobile US 210"
-         mcc="310"
-         mnc="210"
-         apn="epc.tmobile.com"
-         user="none"
-         server="*"
-         password="none"
-         mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
-            />
-
-    <apn carrier="T-Mobile US 160"
-         mcc="310"
-         mnc="160"
-         apn="epc.tmobile.com"
-         user="none"
-         server="*"
-         password="none"
-         mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
-            />
-
-    <apn carrier="T-Mobile US 270"
-         mcc="310"
-         mnc="270"
-         apn="epc.tmobile.com"
-         user="none"
-         server="*"
-         password="none"
-         mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
-            />
-
-    <apn carrier="T-Mobile US 200"
-         mcc="310"
-         mnc="200"
-         apn="epc.tmobile.com"
-         user="none"
-         server="*"
-         password="none"
-         mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
-            />
-
-    <apn carrier="T-Mobile US 220"
-         mcc="310"
-         mnc="220"
-         apn="epc.tmobile.com"
-         user="none"
-         server="*"
-         password="none"
-         mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
-            />
-
-    <apn carrier="T-Mobile US 490"
-         mcc="310"
-         mnc="490"
-         apn="epc.tmobile.com"
-         user="none"
-         server="*"
-         password="none"
-         mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc"
-            />
-
-    <!-- T-Mobile Europe -->
-    <apn carrier="T-Mobile UK"
-         mcc="234"
-         mnc="30"
-         apn="general.t-mobile.uk"
-         user="t-mobile"
-         password="tm"
-         server="*"
-         mmsproxy="149.254.201.135"
-         mmsport="8080"
-         mmsc="http://mmsc.t-mobile.co.uk:8002"
-    />
-
-    <apn carrier="T-Mobile D"
-         mcc="262"
-         mnc="01"
-         apn="internet.t-mobile"
-         user="t-mobile"
-         password="tm"
-         server="*"
-         mmsproxy="172.028.023.131"
-         mmsport="8008"
-         mmsc="http://mms.t-mobile.de/servlets/mms"
-    />
-
-    <apn carrier="T-Mobile A"
-         mcc="232"
-         mnc="03"
-         apn="gprsinternet"
-         user="t-mobile"
-         password="tm"
-         server="*"
-         mmsproxy="010.012.000.020"
-         mmsport="80"
-         mmsc="http://mmsc.t-mobile.at/servlets/mms"
-         type="default"
-    />
-
-    <apn carrier="T-Mobile A MMS"
-         mcc="232"
-         mnc="03"
-         apn="gprsmms"
-         user="t-mobile"
-         password="tm"
-         server="*"
-         mmsproxy="010.012.000.020"
-         mmsport="80"
-         mmsc="http://mmsc.t-mobile.at/servlets/mms"
-         type="mms"
-    />
-
-    <apn carrier="T-Mobile CZ"
-         mcc="230"
-         mnc="01"
-         apn="internet.t-mobile.cz"
-         user="wap"
-         password="wap"
-         server="*"
-         mmsproxy="010.000.000.010"
-         mmsport="80"
-         mmsc="http://mms"
-         type="default"
-    />
-
-    <apn carrier="T-Mobile CZ MMS"
-         mcc="230"
-         mnc="01"
-         apn="mms.t-mobile.cz"
-         user="mms"
-         password="mms"
-         server="*"
-         mmsproxy="010.000.000.010"
-         mmsport="80"
-         mmsc="http://mms"
-         type="mms"
-    />
-
-    <apn carrier="T-Mobile NL"
-         mcc="204"
-         mnc="16"
-         apn="internet"
-         user="*"
-         password="*"
-         server="*"
-         mmsproxy="010.010.010.011"
-         mmsport="8080"
-         mmsc="http://t-mobilemms"
-         type="default"
-    />
-
-    <apn carrier="T-Mobile NL MMS"
-         mcc="204"
-         mnc="16"
-         apn="mms"
-         user="tmobilemms"
-         password="tmobilemms"
-         server="*"
-         mmsproxy="010.010.010.011"
-         mmsport="8080"
-         mmsc="http://t-mobilemms"
-         type="mms"
-    />
-</apns>