diff --git a/b2g_product.mk b/b2g_product.mk
index 3c9eda59144ca9bc47bdd753dc6b563762ed7bc5..68f4da46ffcfcffecef0eecff9b5ead07ead0f10 100644
--- a/b2g_product.mk
+++ b/b2g_product.mk
@@ -98,12 +98,6 @@ ifeq ($(wildcard $(JS_BINARY)),)
endif
-# GAIA_DISTRIBUTION_DIR enables overrides for Gaia settings
-ifndef GAIA_DISTRIBUTION_DIR
-GAIA_DISTRIBUTION_DIR:=$(ANDROID_BUILD_TOP)/out/target/product/$(TARGET_PRODUCT)/gaia_distribution
-export GAIA_DISTRIBUTION_DIR
-endif
-
#
# Multilocale support.
#
diff --git a/gaia_settings/Android.mk b/gaia_settings/Android.mk
deleted file mode 100644
index a09369f6c51d1ccaffdf026246f93d75b252065e..0000000000000000000000000000000000000000
--- a/gaia_settings/Android.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-TEMPLATE_GAIA_DISTRIBUTION_DIR:=$(LOCAL_PATH)/distribution
-
-gaia/profile.tar.gz: $(GAIA_DISTRIBUTION_DIR)/.exist
-
-CAMERA_RECORDING_PREFERREDSIZES=\"cif\"
-ifeq ($(TARGET_PRODUCT),msm8226)
-CAMERA_RECORDING_PREFERREDSIZES=\"720p\"
-endif
-ifeq ($(TARGET_PRODUCT),msm8610)
-CAMERA_RECORDING_PREFERREDSIZES=\"480p\"
-endif
-
-MERGEJSON:=$(LOCAL_PATH)/bin/mergejson
-
-$(GAIA_DISTRIBUTION_DIR)/.exist: $(GAIA_DISTRIBUTION_DIR)/settings.json
-$(GAIA_DISTRIBUTION_DIR)/settings.json: \
- $(GAIA_DISTRIBUTION_DIR)/.settings.tmp \
- $(EXTRA_SETTINGS_JSON_FILE)
- echo extra json file is $(EXTRA_SETTINGS_JSON_FILE)
- if [ -z "$(EXTRA_SETTINGS_JSON_FILE)" ]; then \
- cp $< $@; \
- else \
- $(MERGEJSON) $(EXTRA_SETTINGS_JSON_FILE) $(GAIA_DISTRIBUTION_DIR)/.settings.tmp $@; \
- fi
-
-$(GAIA_DISTRIBUTION_DIR)/.settings.tmp: $(TEMPLATE_GAIA_DISTRIBUTION_DIR)/settings.json
- mkdir -p $(@D)
- cpp -P -DCAMERA_RECORDING_PREFERREDSIZES=$(CAMERA_RECORDING_PREFERREDSIZES) $< $@
-
-$(GAIA_DISTRIBUTION_DIR)/.exist: $(GAIA_DISTRIBUTION_DIR)/partner-prefs.js
-$(GAIA_DISTRIBUTION_DIR)/partner-prefs.js: \
- $(TEMPLATE_GAIA_DISTRIBUTION_DIR)/partner-prefs.js \
- $(EXTRA_PARTNER_PREFS_FILE)
- mkdir -p $(@D)
- cp $< $@
- $(and $(EXTRA_PARTNER_PREFS_FILE),cat $(EXTRA_PARTNER_PREFS_FILE) >> $@)
-
-$(GAIA_DISTRIBUTION_DIR)/.exist: $(GAIA_DISTRIBUTION_DIR)/camera.json
-$(GAIA_DISTRIBUTION_DIR)/camera.json: \
- $(TEMPLATE_GAIA_DISTRIBUTION_DIR)/camera.json
- mkdir -p $(@D)
- cp $< $@
-
-$(GAIA_DISTRIBUTION_DIR)/.exist:
- mkdir -p $(@D)
- touch $@
diff --git a/gaia_settings/bin/mergejson b/gaia_settings/bin/mergejson
deleted file mode 100755
index 455cb0abf4161fcde8665de2dd0dc6875db931d1..0000000000000000000000000000000000000000
--- a/gaia_settings/bin/mergejson
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/usr/bin/env python2.7
-
-# Copyright (c) 2014, 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
-# met:
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-# * Neither the name of The Linux Foundation nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-def usage():
- print """
-Merge two JSON files into a single file
-Usage: mergeJSON [input file 1] [input file 2] [output file]
-"""
-
-import sys
-
-if len(sys.argv) < 2 or sys.argv[1] == '-h':
- usage()
- sys.exit(0)
-
-if len(sys.argv) < 4:
- print('error: please provide input and output files')
- usage()
- sys.exit(1)
-
-baseA = sys.argv[1]
-baseB = sys.argv[2]
-merge = sys.argv[3]
-
-import json
-from pprint import pprint
-
-dictA = None
-with open(baseA) as f:
- dictA = json.load(f)
-
-dictB = None
-with open(baseB) as f:
- dictB = json.load(f)
-
-dictMerge = {key: value for (key, value)
- in (dictA.items() + dictB.items())}
-
-with open(merge, 'w') as f:
- json.dump(dictMerge, f)
-
-print('Merged ' + str(baseA) + ' and ' + str(baseB) + ' into ' + str(merge))
diff --git a/gaia_settings/distribution/camera.json b/gaia_settings/distribution/camera.json
deleted file mode 100644
index 7f6b2ad9ddb843031e6b95ba48af26d24cdff514..0000000000000000000000000000000000000000
--- a/gaia_settings/distribution/camera.json
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
-Copyright (c) 2014, 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
-met:
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above
- copyright notice, this list of conditions and the following
- disclaimer in the documentation and/or other materials provided
- with the distribution.
- * Neither the name of The Linux Foundation nor the names of its
- contributors may be used to endorse or promote products derived
- from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-{
- "maxImagePixelSize": 5242880,
- "maxSnapshotPixelSize": 3145728,
- "requiredEXIFPreviewSize": { "width": 640, "height": 480}
-}
diff --git a/gaia_settings/distribution/partner-prefs.js b/gaia_settings/distribution/partner-prefs.js
deleted file mode 100644
index 35b7914645e1b4680fc5d41c80b42dc0e5decd30..0000000000000000000000000000000000000000
--- a/gaia_settings/distribution/partner-prefs.js
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-Copyright (c) 2014, 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
-met:
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above
- copyright notice, this list of conditions and the following
- disclaimer in the documentation and/or other materials provided
- with the distribution.
- * Neither the name of The Linux Foundation nor the names of its
- contributors may be used to endorse or promote products derived
- from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-pref("media.navigator.load_adapt.avg_seconds", 10);
-pref("media.navigator.load_adapt.high_load","0.95");
-pref("media.peerconnection.video.h264_enabled", true);
-pref("media.peerconnection.video.max_bitrate", 600);
diff --git a/gaia_settings/distribution/settings.json b/gaia_settings/distribution/settings.json
deleted file mode 100644
index 7afcfb83f68b1aadcb4531f1ec19c8146d354ba6..0000000000000000000000000000000000000000
--- a/gaia_settings/distribution/settings.json
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
-Copyright (c) 2014, 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
-met:
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above
- copyright notice, this list of conditions and the following
- disclaimer in the documentation and/or other materials provided
- with the distribution.
- * Neither the name of The Linux Foundation nor the names of its
- contributors may be used to endorse or promote products derived
- from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-{
- "camera.recording.preferredSizes": [CAMERA_RECORDING_PREFERREDSIZES]
-}