commit 31b15b7a899666e9afada73774c4051689b3465c
author Steve Kondik <shade@chemlab.org> Mon Dec 09 05:40:25 2013 +0000
committer Androidsftw <androidsftwsub@gmail.com> Mon Jan 13 21:26:47 2014 -0700
tree 929527b3e6d1aebed8d5c43e35f961921fadc91e
parent 103312fe503a2f643e02f8ab379e865debb80069

vendor: Allow devices to set the GMS client id

This will look for flags in omni_<device>.mk, if none preset, use ro.com.google.clientidbase=android-google

Conflicts:
	config/common.mk

Change-Id: I42957104837b96ea24e485c8dd2e6332ff42d5b7

config/common.mk

diff --git a/config/common.mk b/config/common.mk
index 040a132..c3d39a3 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -4,11 +4,18 @@
 PRODUCT_COPY_FILES += \
     vendor/omni/prebuilt/bootanimation/bootanimation.zip:system/media/bootanimation.zip
 
+ifeq ($(PRODUCT_GMS_CLIENTID_BASE),)
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.com.google.clientidbase=android-google
+else
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.com.google.clientidbase=$(PRODUCT_GMS_CLIENTID_BASE)
+endif
+
 # general properties
 PRODUCT_PROPERTY_OVERRIDES += \
     keyguard.no_require_sim=true \
     ro.url.legal=http://www.google.com/intl/%s/mobile/android/basic/phone-legal.html \
-    ro.com.google.clientidbase=android-google \
     ro.com.android.wifi-watchlist=GoogleGuest \
     ro.setupwizard.enterprise_mode=1 \
     ro.com.android.dateformat=MM-dd-yyyy \