From dc790b0f1d2e2163a692c15331299e795cf7148d Mon Sep 17 00:00:00 2001
From: Andrew Flynn <flynn@google.com>
Date: Fri, 13 Apr 2012 08:53:44 -0700
Subject: Default ro.carrier to unknown

This was previously performed by init.c

Change-Id: Id34c636e06dfe2766446f909e9d05557163d812d
---
 CleanSpec.mk                           | 3 +++
 target/product/generic_no_telephony.mk | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/CleanSpec.mk b/CleanSpec.mk
index 1d9b9bb..481829a 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -119,6 +119,9 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/*)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/*)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
 
+# Changing where ro.carrier value is instantiated for system/build.prop
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
+
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
 # ************************************************
diff --git a/target/product/generic_no_telephony.mk b/target/product/generic_no_telephony.mk
index e1b5474..862d381 100644
--- a/target/product/generic_no_telephony.mk
+++ b/target/product/generic_no_telephony.mk
@@ -74,6 +74,9 @@ PRODUCT_COPY_FILES := \
         frameworks/av/media/libeffects/data/audio_effects.conf:system/etc/audio_effects.conf \
         hardware/libhardware_legacy/audio/audio_policy.conf:system/etc/audio_policy.conf
 
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.carrier=unknown
+
 $(call inherit-product-if-exists, frameworks/base/data/fonts/fonts.mk)
 $(call inherit-product-if-exists, external/lohit-fonts/fonts.mk)
 $(call inherit-product-if-exists, frameworks/base/data/keyboards/keyboards.mk)
-- 
cgit v1.1