Tweak sapphire config to better match dream config

Change-Id: I7cb71c89e8643b231173f9f219f8e2d00b5b5c7d

16 files changed, 75 insertions, 183 deletions

diff --git a/AndroidBoard.mk b/AndroidBoard.mk
index 2c20b8c..b041416 100644
--- a/AndroidBoard.mk
+++ b/AndroidBoard.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 The Android Open Source Project
+# Copyright (C) 2007 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.
diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 4488cf6..9d7e7a1 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -1,4 +1,5 @@
-# Copyright (C) 2009 The Android Open Source Project
+#
+# Copyright (C) 2008 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.
@@ -11,10 +12,17 @@
 # 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.
+#
 
 #
-# This file lists the product definition files that define
-# configurations which are actually buildable (e.g. through lunch)
+# This file should set PRODUCT_MAKEFILES to a list of product makefiles
+# to expose to the build system.  LOCAL_DIR will already be set to
+# the directory containing this file.
+#
+# This file may not rely on the value of any variable other than
+# LOCAL_DIR; do not use any conditionals, and do not look up the
+# value of any variable that isn't set in this file or in a file that
+# it includes.
 #
 
 PRODUCT_MAKEFILES := \
diff --git a/BoardConfig.mk b/BoardConfig.mk
index c443f90..e0f4142 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 The Android Open Source Project
+# Copyright (C) 2007 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.
@@ -74,7 +74,7 @@ BOARD_FLASH_BLOCK_SIZE := 131072
 # OpenGL drivers config file path
 BOARD_EGL_CFG := device/htc/sapphire/egl.cfg
 
-# No fallback font by default for Sapphire (space savings)
+# No fallback font by default (space savings)
 NO_FALLBACK_FONT:=true
 
 TARGET_RECOVERY_UI_LIB := librecovery_ui_sapphire librecovery_ui_htc
diff --git a/board-info.txt b/board-info.txt
index c6459be..24115cf 100644
--- a/board-info.txt
+++ b/board-info.txt
@@ -3,4 +3,3 @@ require board=sapphire
 require version-bootloader=1.33.2005|1.33.0005|1.33.3004|1.33.3005|1.33.3007
 require version-baseband=2.22.19.26I
 require version-cpld=10|12
-
diff --git a/device_sapphire.mk b/device_sapphire.mk
index f734b2a..098e26a 100644
--- a/device_sapphire.mk
+++ b/device_sapphire.mk
@@ -14,14 +14,10 @@
 # limitations under the License.
 #
 
-PRODUCT_MANUFACTURER := HTC
-DEVICE_PACKAGE_OVERLAYS := device/htc/sapphire/overlay device/htc/common/overlay vendor/htc/common/overlay
-
-# we have enough storage space to hold precise GC data
-#PRODUCT_TAGS += dalvik.gc.type-precise
+DEVICE_PACKAGE_OVERLAYS := device/htc/sapphire/overlay
 
 # Install the features available on this device.
-PRODUCT_COPY_FILES += \
+PRODUCT_COPY_FILES := \
     frameworks/base/data/etc/handheld_core_hardware.xml:system/etc/permissions/handheld_core_hardware.xml \
     frameworks/base/data/etc/android.hardware.camera.autofocus.xml:system/etc/permissions/android.hardware.camera.autofocus.xml \
     frameworks/base/data/etc/android.hardware.telephony.gsm.xml:system/etc/permissions/android.hardware.telephony.gsm.xml \
@@ -29,14 +25,14 @@ PRODUCT_COPY_FILES += \
     frameworks/base/data/etc/android.hardware.wifi.xml:system/etc/permissions/android.hardware.wifi.xml \
     frameworks/base/data/etc/android.hardware.touchscreen.multitouch.xml:system/etc/permissions/android.hardware.touchscreen.multitouch.xml
 
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_PROPERTY_OVERRIDES := \
     ro.media.dec.jpeg.memcap=10000000
 
 # media configuration xml file
 PRODUCT_COPY_FILES += \
     device/htc/sapphire/media_profiles.xml:/system/etc/media_profiles.xml
 
-# proprietary side of sapphire
+# proprietary side of the device
 $(call inherit-product-if-exists, vendor/htc/sapphire/device_sapphire-vendor.mk)
 
 # stuff common to all HTC phones
diff --git a/device_sapphire_as.mk b/device_sapphire_as.mk
index 56f1df5..cb42fb7 100644
--- a/device_sapphire_as.mk
+++ b/device_sapphire_as.mk
@@ -14,9 +14,8 @@
 # limitations under the License.
 #
 
-# To be included directly by a product makefile; do not use inherit-product.
-
-PRODUCT_COPY_FILES += \
+PRODUCT_COPY_FILES := \
 	device/htc/sapphire/gps.conf_AS:system/etc/gps.conf
 
+$(call inherit-product-if-exists, vendor/htc/sapphire/device_sapphire_as-vendor.mk)
 $(call inherit-product, device/htc/sapphire/device_sapphire.mk)
diff --git a/device_sapphire_eu.mk b/device_sapphire_eu.mk
index 1348a0e..227db66 100644
--- a/device_sapphire_eu.mk
+++ b/device_sapphire_eu.mk
@@ -14,9 +14,8 @@
 # limitations under the License.
 #
 
-# To be included directly by a product makefile; do not use inherit-product.
-
-PRODUCT_COPY_FILES += \
+PRODUCT_COPY_FILES := \
 	device/htc/sapphire/gps.conf_EU:system/etc/gps.conf
 
+$(call inherit-product-if-exists, vendor/htc/sapphire/device_sapphire_eu-vendor.mk)
 $(call inherit-product, device/htc/sapphire/device_sapphire.mk)
diff --git a/device_sapphire_us.mk b/device_sapphire_us.mk
index 98edf9f..a498459 100644
--- a/device_sapphire_us.mk
+++ b/device_sapphire_us.mk
@@ -14,9 +14,8 @@
 # limitations under the License.
 #
 
-# To be included directly by a product makefile; do not use inherit-product.
-
-PRODUCT_COPY_FILES += \
+PRODUCT_COPY_FILES := \
 	device/htc/sapphire/gps.conf_US:system/etc/gps.conf
 
+$(call inherit-product-if-exists, vendor/htc/sapphire/device_sapphire_us-vendor.mk)
 $(call inherit-product, device/htc/sapphire/device_sapphire.mk)
diff --git a/egl.cfg b/egl.cfg
index 1abab05..f67bfa2 100644
--- a/egl.cfg
+++ b/egl.cfg
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2009 Google Inc.
+# 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.
diff --git a/init.sapphire.rc b/init.sapphire.rc
index c54a8d0..17cb216 100644
--- a/init.sapphire.rc
+++ b/init.sapphire.rc
@@ -1,14 +1,28 @@
+# Copyright (C) 2008 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.
+
 on early-init
     device mtd@misc 0460 radio diag
 
 # Set timeout value for rmnet stats.
-  write /sys/devices/virtual/net/rmnet0/timeout_suspend 5000000
-  write /sys/devices/virtual/net/rmnet0/timeout 18000000
+    write /sys/devices/virtual/net/rmnet0/timeout_suspend 5000000
+    write /sys/devices/virtual/net/rmnet0/timeout 18000000
 
 on boot
 # unmap left alt to avoid console switch
     setkey 0x0 0x38 0x0
-# sapphire reset SEND+MENU+END
+# reset SEND+MENU+END
     setkey 0x0 0xe7 0x706
     setkey 0x0 0x8b 0x707
 
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 795782f..f839b81 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -20,7 +20,7 @@
 <!-- These resources are around just to allow their values to be customized
      for different hardware and product builds. -->
 <resources>
-    <!-- The Sapphire 2d accelerator can't do an alpha transformation of
+    <!-- The 2d accelerator can't do an alpha transformation of
          a surface with an alpha channel, so enable this special mode
          to avoid going into software rendering. -->
     <bool name="config_sf_limitedAlpha">true</bool>
diff --git a/recovery/images/README b/recovery/images/README
index 01b68d5..9447250 100644
--- a/recovery/images/README
+++ b/recovery/images/README
@@ -1,6 +1,6 @@
 This directory contains the firmware_install.565 and
 firmware_error.565 bitmaps shown when installing a radio or hboot
-update via OTA on a sapphire device.
+update via OTA on this device.
 
 They were generated from the corresponding .png files by doing:
 
diff --git a/system.prop b/system.prop
index e5bb39b..c96c2b8 100644
--- a/system.prop
+++ b/system.prop
@@ -1,5 +1,19 @@
+# Copyright (C) 2008 The Android Open Source Project
 #
-# system.prop for sapphire 
+# 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.
+
+#
+# system.prop for dream or sapphire
 #
 
 rild.libpath=/system/lib/libhtc_ril.so
diff --git a/tools/Android.mk b/tools/Android.mk
index e558eb8..e56de8a 100644
--- a/tools/Android.mk
+++ b/tools/Android.mk
@@ -12,46 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
 ifeq ($(TARGET_DEVICE),sapphire)
 ifneq ($(BUILD_TINY_ANDROID),true)
 
 LOCAL_PATH:= $(call my-dir)
 
 #
-# sndrpc
-#
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES:= sndrpc.c
-
-LOCAL_CFLAGS:= \
-	-fno-short-enums \
-	-include $(TARGET_OUT_HEADERS)/libcommondefs-rpc/inc/commondefs.h \
-	-include $(TARGET_OUT_HEADERS)/libsnd-rpc/inc/snd_dream.h \
-	-include $(TARGET_OUT_HEADERS)/libsnd-rpc/inc/snd_common.h \
-	-DVOC_CODEC_DEFAULT=0  # backward compat server with ARM9
-
-LOCAL_STATIC_LIBRARIES += \
-	libsnd-rpc \
-	libcommondefs-rpc
-
-LOCAL_SHARED_LIBRARIES += librpc
-
-LOCAL_C_INCLUDES:= \
-	$(TARGET_OUT_HEADERS)/librpc \
-	$(TARGET_OUT_HEADERS)/libpcm \
-	$(TARGET_OUT_HEADERS)/libsnd-rpc \
-	$(TARGET_OUT_HEADERS)/libcommondefs-rpc
-
-LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
-LOCAL_MODULE_TAGS := eng
-LOCAL_MODULE:= sndrpc
-
-include $(BUILD_EXECUTABLE)
-
-#
 # btconfig
 #
 
diff --git a/tools/sndrpc.c b/tools/sndrpc.c
deleted file mode 100644
index e4f4de6..0000000
--- a/tools/sndrpc.c
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Copyright (C) 2007 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.
- */
-
-/** Make sound routing RPC calls to the ARM 9 on Dream (debug only) */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <errno.h>
-#include <sys/uio.h>
-#include <unistd.h>
-
-#include <inc/snd.h>
-
-#define __GLUE(a,b) a ## b
-#define GLUE(a,b) __GLUE(a,b)
-#define FUNC_RPC_SND_SET_DEVICE GLUE(rpc_snd_set_device_, SNDVERS)
-#define FUNC_RPC_SND_SET_VOLUME GLUE(rpc_snd_set_volume_, SNDVERS)
-
-CLIENT* client;
-enum clnt_stat result;
-
-void snd_set_device(int device) {
-    printf("snd_set_device %d\n", device);
-
-    rpc_snd_set_device_args args;
-    args.device = device;
-    args.ear_mute = RPC_SND_MUTE_UNMUTED;
-    args.mic_mute = RPC_SND_MUTE_UNMUTED;
-    args.callback_ptr = -1;
-    args.client_data = 0;
-
-    result = FUNC_RPC_SND_SET_DEVICE(&args, NULL, client);
-}
-
-void snd_set_volume(int device, int volume, int type) {
-    printf("snd_set_volume %d\n", volume);
-
-    rpc_snd_set_volume_args args;
-    args.device = device;
-    args.method = type;
-    args.volume = volume;
-    args.callback_ptr = -1;
-    args.client_data = 0;
-
-    result = FUNC_RPC_SND_SET_VOLUME(&args, NULL, client);
-}
-
-int main(int argc, char **argv) {
-
-    client = clnt_create(NULL, SNDPROG, SNDVERS, NULL);
-    if (client == NULL) {
-        printf("Could not create RPC client\n");
-        return -1;
-    }
-
-    if (argc == 1) {
-        goto usage;
-    }
-
-    if (argc >= 3 && strcmp(argv[1], "snd_set_device") == 0) {
-        int device = atoi(argv[2]);
-        snd_set_device(device);
-    } else if (argc >= 5 && strcmp(argv[1], "snd_set_volume") == 0) {
-        int device = atoi(argv[2]);
-        int volume = atoi(argv[3]);
-        int type = atoi(argv[4]);
-        snd_set_volume(device,volume, type);
-    } else {
-usage:
-        printf("Usage:\n");
-        printf("\tsndrpc snd_set_device [device]\n");
-        printf("\tsndrpc snd_set_volume [device] [volume] [type]\n");
-        printf("\n");
-        printf("[device]\n");
-        printf("RPC_HTC_SND_DEVICE_HANDSET  = 0,\n"
-"RPC_HTC_SND_DEVICE_SPEAKER  = 1,\n"
-"RPC_HTC_SND_DEVICE_HEADSET  = 2,\n"
-"RPC_HTC_SND_DEVICE_BT       = 3,\n"
-"RPC_HTC_SND_DEVICE_CARKIT   = 4,\n"
-"RPC_HTC_SND_DEVICE_TTY_FULL = 5,\n"
-"RPC_HTC_SND_DEVICE_TTY_VCO  = 6,\n"
-"RPC_HTC_SND_DEVICE_TTY_HCO  = 7,\n"
-"RPC_HTC_SND_DEVICE_TTY_EXT  = 8,\n"
-"RPC_HTC_SND_DEVICE_TBD2     = 9,\n"
-"RPC_HTC_SND_DEVICE_TBD3     =10,\n"
-"RPC_HTC_SND_DEVICE_TBD4     =11,\n");
-        printf("[type]\n");
-        printf("RPC_SND_METHOD_VOICE = 0,\n"
-"RPC_SND_METHOD_KEY_BEEP,\n"
-"RPC_SND_METHOD_MESSAGE,\n"
-"RPC_SND_METHOD_RING,\n"
-"RPC_SND_METHOD_MIDI,\n"
-"RPC_SND_METHOD_AUX,\n");
-        return 0;
-    }
-
-    if (result == RPC_SUCCESS) {
-        printf("SUCCESS\n");
-    } else {
-        printf("FAILED\n");
-    }
-
-    return 0;
-}
diff --git a/vold.fstab b/vold.fstab
index efbb07b..a48b0ce 100644
--- a/vold.fstab
+++ b/vold.fstab
@@ -1,4 +1,19 @@
-## Vold 2.0 fstab for HTC Magic (Sapphire)
+# 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)
 ##