Skip to main content

Browse the archive

Revision c8f861e2adcb56028398bc4cfcdf2316ca40e7da authored by B2G Bumper Bot on 07 April 2014, 18:20:21 UTC, committed by B2G Bumper Bot on 07 April 2014, 18:20:21 UTC 
Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
 
========

https://hg.mozilla.org/integration/gaia-1_3/rev/65893b72eb03
Author: Bob Silverberg <bob.silverberg@gmail.com>
Desc: Merge pull request #18050 from bobsilverberg/revert_revert

Bug 991657 - [v1.3] Backport test_cards_view_with_two_apps.py test to v1.3

========

https://hg.mozilla.org/integration/gaia-1_3/rev/37604331df73
Author: Bob Silverberg <bob.silverberg@gmail.com>
Desc: Fix issue with mozdevice >=0.31 on TBPL

========

https://hg.mozilla.org/integration/gaia-1_3/rev/583c3db01206
Author: Bob Silverberg <bob.silverberg@gmail.com>
Desc: Revert "Revert "Merge pull request #17988 from bobsilverberg/cards_view_v1.3""

This reverts commit f43898e5c9488ae8614c71d2fe9b7c205726c471.

========

https://hg.mozilla.org/integration/gaia-1_3/rev/f34b173dd4a0
Author: Ryan VanderMeulen <ryanvm@gmail.com>
Desc: Revert "Merge pull request #17988 from bobsilverberg/cards_view_v1.3"

This reverts commit 76e87fb7c2aa4ae4311b92ddab3e3fd484f28094, reversing
changes made to 7928935802853da76aeb5577a76678eef72d84e9.
1 parent da52300
Raw File
moz.build 
# -*- 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/.

CONFIGURE_SUBST_FILES += [
    'mozilla-config.h',
    'tools/update-packaging/Makefile',
]

if CONFIG['ENABLE_CLANG_PLUGIN']:
  add_tier_dir('base', 'build/clang-plugin', external=True)

add_tier_dir('base', ['config', 'build', 'probes', 'python'])

if not CONFIG['LIBXUL_SDK']:
    add_tier_dir('base', ['mfbt'])

    if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gonk'):
        add_tier_dir('base', ['other-licenses/android'])

    if CONFIG['MOZ_MEMORY']:
        add_tier_dir('base', ['memory'])

    if not CONFIG['MOZ_NATIVE_ZLIB']:
        add_tier_dir('base', ['modules/zlib'])

    add_tier_dir('base', ['mozglue', 'memory/mozalloc'])

add_tier_dir('precompile', 'xpcom/xpidl')

# Bring in the configuration for the configured application.
include('/' + CONFIG['MOZ_BUILD_APP'] + '/app.mozbuild')
back to top