browser/components/preferences/in-content/moz.build
author Mike Conley <mconley@mozilla.com>
Tue, 04 Nov 2014 22:42:44 -0500
changeset 233628 e4a43029e62769ce7953ef8237d23f9095a5b0b5
parent 228034 b97b76db0e3e5ae3db7f0571458b308dce085ccc
child 289024 88ef22723df67da787a0b1ac5a330f7e81d94916
permissions -rw-r--r--
Bug 1085622 - Fix E10S_TESTING_ONLY define so that it only ever applies when E10S_TESTING_ONLY config is true. r=ally,glandium. a=gavin. We were defining the E10S_TESTING_ONLY build-time define with the value of the E10S_TESTING_ONLY config variable, regardless of the value of E10S_TESTING_ONLY. Even if E10S_TESTING_ONLY in configure was blank, we'd still define E10S_TESTING_ONLY, which resulted in E10S_TESTING_ONLY ifdef'd code to be included when we didn't want it to. We now only ever define E10S_TESTING_ONLY iff NIGHTLY_BUILD is defined, and we do it globally. This also fixes a busted E10S_TESTING_ONLY ifdef that didn't have an endif.

# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

for var in ('MOZ_APP_NAME', 'MOZ_MACBUNDLE_NAME'):
    DEFINES[var] = CONFIG[var]

if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'cocoa'):
    DEFINES['HAVE_SHELL_SERVICE'] = 1

JAR_MANIFESTS += ['jar.mn']