author Gaia Pushbot <release+gaiajson@mozilla.com>
Mon, 14 Oct 2013 09:55:26 -0700
changeset 164500 37e925e977cd1fec6a5b731c4e30b8a260877844
parent 163484 20613b2d640db9fd2b62b01ccc3ff6551151886f
child 168465 2eb99b1ad61f79fc78c075618aab6e55cec975f3
permissions -rw-r--r--
Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/4ef060ed5c40 Author: Eitan Isaacson <eitan@monotonous.org> Desc: Merge pull request #12766 from eeejay/bug-925164 Bug 925164 - Remove role and label from slider area. ======== https://hg.mozilla.org/integration/gaia-central/rev/3417ff371169 Author: Eitan Isaacson <eitan@monotonous.org> Desc: Bug 925164 - Remove role and label from slider area.

# 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/.

# Avoid recursive make to avoid having to add files to the gtest/ subdirectory
# (which is third-party code), and to make the build faster.

  $(srcdir) \
  $(srcdir)/gtest/src \
  $(srcdir)/mozilla \
  $(srcdir)/gmock/src \

  -I$(srcdir)/gtest \
  -I$(srcdir)/gtest/include \
  -I$(srcdir)/gmock \
  -I$(srcdir)/gmock/include \

include $(topsrcdir)/config/rules.mk

ifeq (browser,$(MOZ_BUILD_APP))
# Disable because of metro linking error bug 883339:
# LNK1181: cannot open input file 'runtimeobject.lib'
# And non metro linking error bug 886656:
# LNK1112: module machine type 'x64' conflicts with target machine type 'X86'
ifneq ($(OS_ARCH),WINNT)
check gtest::
	$(MAKE) -C $(DEPTH)/toolkit/library gtestxul
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
	$(MAKE) -C $(DEPTH)/browser/app repackage
	$(PYTHON) $(topsrcdir)/testing/gtest/rungtests.py --xre-path=$(DIST)/bin --symbols-path=$(DIST)/crashreporter-symbols $(DIST)/bin/$(MOZ_APP_NAME)$(BIN_SUFFIX)