Merge from donut

5 files changed, 40 insertions, 4 deletions

diff --git a/.gitignore b/.gitignore
index f5b82f3..915137a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
+htc-adp1.sfx*
+htc/*
 proprietary/*
diff --git a/clean-files.sh b/clean-files.sh
index 4abd34d..91757a6 100755
--- a/clean-files.sh
+++ b/clean-files.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
 
-rm -rf proprietary
+rm -rf htc-adp1.sfx* htc proprietary
+rm -f ../../../signed-dream_devphone_userdebug-ota-14721.zip
 
 ./common.sh clean-files
diff --git a/device_dream_eu.mk b/device_dream_eu.mk
new file mode 100644
index 0000000..77354e0
--- /dev/null
+++ b/device_dream_eu.mk
@@ -0,0 +1,23 @@
+#
+# 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.
+#
+
+# To be included directly by a product makefile; do not use inherit-product.
+
+PRODUCT_COPY_FILES += \
+	vendor/htc/dream-open/proprietary/AudioPara4_EU.csv:system/etc/AudioPara4.csv \
+	vendor/htc/dream-open/proprietary/gps.conf_EU:system/etc/gps.conf
+
+include vendor/htc/dream-open/device_dream.mk
diff --git a/device_dream_us.mk b/device_dream_us.mk
index 2435a73..efb2a5b 100644
--- a/device_dream_us.mk
+++ b/device_dream_us.mk
@@ -17,7 +17,7 @@
 # To be included directly by a product makefile; do not use inherit-product.
 
 PRODUCT_COPY_FILES += \
-	vendor/htc/dream-open/proprietary/AudioPara4.csv:system/etc/AudioPara4.csv \
-	vendor/htc/dream-open/proprietary/gps.conf:system/etc/gps.conf
+	vendor/htc/dream-open/proprietary/AudioPara4_US.csv:system/etc/AudioPara4.csv \
+	vendor/htc/dream-open/proprietary/gps.conf_US:system/etc/gps.conf
 
 include vendor/htc/dream-open/device_dream.mk
diff --git a/unzip-files.sh b/unzip-files.sh
index c3d3199..cd9fe22 100755
--- a/unzip-files.sh
+++ b/unzip-files.sh
@@ -4,7 +4,17 @@ mkdir -p proprietary
 
 ZIP=signed-dream_devphone_userdebug-ota-14721.zip
 
-unzip -j -o ../../../$ZIP system/etc/AudioFilter.csv system/etc/AudioPara4.csv system/etc/AudioPreProcess.csv system/etc/firmware/brf6300.bin system/etc/gps.conf system/etc/wifi/Fw1251r1c.bin system/lib/libhtc_acoustic.so system/lib/libhtc_ril.so system/lib/hw/sensors.trout.so -d proprietary
+if test -d htc ; then
+    cp -f htc/AudioFilter.csv htc/AudioPara4_EU.csv htc/AudioPara4_US.csv htc/AudioPreProcess.csv htc/libhtc_acoustic.so proprietary
+else
+    unzip -j -o ../../../$ZIP system/etc/AudioFilter.csv system/etc/AudioPara4.csv system/etc/AudioPreProcess.csv system/etc/gps.conf system/lib/libhtc_acoustic.so -d proprietary
+    mv -f proprietary/AudioPara4.csv proprietary/AudioPara4_US.csv
+    cp -f proprietary/AudioPara4_US.csv proprietary/AudioPara4_EU.csv
+    echo WARNING no EU version of AudioPara4.csv, using US version in EU builds
+fi
+unzip -j -o ../../../$ZIP system/etc/firmware/brf6300.bin system/etc/gps.conf system/etc/wifi/Fw1251r1c.bin system/lib/libhtc_ril.so system/lib/hw/sensors.trout.so -d proprietary
+mv -f proprietary/gps.conf proprietary/gps.conf_US
+sed s/north-america/europe/ < proprietary/gps.conf_US > proprietary/gps.conf_EU
 touch proprietary/*
 
 (cd ../common-open/akmd && ./unzip-files.sh $ZIP)