Get rid of system.prop, replaced by PRODUCT_PROPERTY_OVERRIDES

Change-Id: Ia341ab90e48ae0834f3e1f8b61860d61259e74e9

2 files changed, 20 insertions, 32 deletions

diff --git a/device_sapphire.mk b/device_sapphire.mk
index 098e26a..99e3dae 100644
--- a/device_sapphire.mk
+++ b/device_sapphire.mk
@@ -28,6 +28,26 @@ PRODUCT_COPY_FILES := \
 PRODUCT_PROPERTY_OVERRIDES := \
     ro.media.dec.jpeg.memcap=10000000
 
+PRODUCT_PROPERTY_OVERRIDES += \
+    rild.libpath=/system/lib/libhtc_ril.so \
+    wifi.interface=tiwlan0
+
+# Time between scans in seconds. Keep it high to minimize battery drain.
+# This only affects the case in which there are remembered access points,
+# but none are in range.
+PRODUCT_PROPERTY_OVERRIDES += \
+    wifi.supplicant_scan_interval=15
+
+# density in DPI of the LCD of this board. This is used to scale the UI
+# appropriately. If this property is not defined, the default value is 160 dpi. 
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.sf.lcd_density=160
+
+# Default network type
+# 0 => WCDMA Preferred.
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.telephony.default_network=0
+
 # media configuration xml file
 PRODUCT_COPY_FILES += \
     device/htc/sapphire/media_profiles.xml:/system/etc/media_profiles.xml
diff --git a/system.prop b/system.prop
deleted file mode 100644
index c96c2b8..0000000
--- a/system.prop
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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.
-
-#
-# system.prop for dream or sapphire
-#
-
-rild.libpath=/system/lib/libhtc_ril.so
-wifi.interface = tiwlan0
-# Time between scans in seconds. Keep it high to minimize battery drain.
-# This only affects the case in which there are remembered access points,
-# but none are in range.
-wifi.supplicant_scan_interval = 15
-
-# density in DPI of the LCD of this board. This is used to scale the UI
-# appropriately. If this property is not defined, the default value is 160 dpi. 
-ro.sf.lcd_density = 160
-
-# Default network type
-# 0 => WCDMA Preferred.
-ro.telephony.default_network = 0