Merge "Disable Moz RIL and geo location code at compile time"

b2g_product.mk

-# Copyright (c) 2012,2013,2014 The Linux Foundation. All rights reserved.
+# Copyright (c) 2012-2015 The Linux Foundation. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
@@ -136,6 +136,8 @@ endif
 # Target-specific Gecko configuration
 # Enable DSP-based EC/NS for webRTC
 GECKO_CONFIGURE_ARGS+=--enable-hardware-aec-ns
+# Disable Mozilla's RIL and Location modules
+GECKO_CONFIGURE_ARGS+=--disable-mozril-geoloc
 
 # Env variables used for Gaia multilocale support
 LOCALE_BASEDIR=$(abspath gaia-l10n)