Skip to main content

Browse the archive

Revision 47fd2640f74a19aa7e190da93fc70ed6d8b7a065 authored by Gaia Pushbot on 22 January 2014, 19:15:54 UTC, committed by Gaia Pushbot on 22 January 2014, 19:15:54 UTC 
Bumping gaia.json for 2 gaia-1_3 revision(s) a=gaia-bump
 
========

https://hg.mozilla.org/integration/gaia-1_3/rev/54db68e1e861
Author: John Hu <johu@mozilla.com>
Desc: Merge pull request #15235 from huchengtw-moz/gallery/Bug_951241-blue-line

Bug 951241 - [B2G][Gallery][Image Edit] Image preview in edit mode shows...,  r=djf
(cherry picked from commit c99867fe9ba161535e764ba6582ea13a7c25e324)

========

https://hg.mozilla.org/integration/gaia-1_3/rev/0d133e3490c7
Author: John Ford <john@johnford.info>
Desc: Revert "Merge pull request #15540 from SasikalaParuchuri/Bug_935991_Added_Test_For_Delete_Option"

This reverts commit 4c3e265f50d32d778654f81079092c94a6fd2b4f.
1 parent 7d9d398
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/.

if CONFIG['OS_ARCH'] not in ('WINNT', 'OS2'):
    DIRS += ['unix']
elif CONFIG['OS_ARCH'] == 'WINNT':
    DIRS += ['win32']

if CONFIG['OS_TARGET'] == 'Android' and not CONFIG['MOZ_ANDROID_LIBSTDCXX']:
    DIRS += ['stlport']

if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
    DIRS += ['annotationProcessors']
    TEST_DIRS += [
        'mobile/sutagent/android',
        'mobile/sutagent/android/watcher',
        'mobile/sutagent/android/ffxcp',
        'mobile/sutagent/android/fencp',
        'mobile/robocop',
    ]

for var in ('GRE_MILESTONE', 'MOZ_APP_VERSION', 'MOZ_APP_BASENAME',
            'MOZ_APP_VENDOR', 'MOZ_APP_ID', 'MAR_CHANNEL_ID',
            'ACCEPTED_MAR_CHANNEL_IDS'):
    DEFINES[var] = CONFIG[var]

if CONFIG['MOZ_BUILD_APP'] == 'browser':
    DEFINES['MOZ_BUILD_APP_IS_BROWSER'] = True

if CONFIG['MOZ_APP_PROFILE']:
    DEFINES['MOZ_APP_PROFILE'] = CONFIG['MOZ_APP_PROFILE']

for var in ('MOZ_CRASHREPORTER', 'MOZ_PROFILE_MIGRATOR',
            'MOZ_EXTENSION_MANAGER', 'MOZ_APP_STATIC_INI'):
    if CONFIG[var]:
        DEFINES[var] = True
back to top