browser/base/moz.build
author Mike Conley <mconley@mozilla.com>
Tue, 04 Nov 2014 22:42:44 -0500
changeset 233628 e4a43029e62769ce7953ef8237d23f9095a5b0b5
parent 213297 a86527f8f58af99a98a509b7f4b97c2648c4a521
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/.

MOCHITEST_MANIFESTS += [
    'content/test/general/mochitest.ini',
]

MOCHITEST_CHROME_MANIFESTS += [
    'content/test/chrome/chrome.ini',
]

BROWSER_CHROME_MANIFESTS += [
    'content/test/chat/browser.ini',
    'content/test/general/browser.ini',
    'content/test/newtab/browser.ini',
    'content/test/plugins/browser.ini',
    'content/test/popupNotifications/browser.ini',
    'content/test/social/browser.ini',
]

DEFINES['MOZ_APP_VERSION'] = CONFIG['MOZ_APP_VERSION']

DEFINES['APP_LICENSE_BLOCK'] = '%s/content/overrides/app-license.html' % SRCDIR

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

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

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

JAR_MANIFESTS += ['jar.mn']