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
android-common.mk 
# 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/.

# Ensure JAVA_CLASSPATH and ANDROID_SDK are defined before including this file.
# We use common android defaults for boot class path and java version.
ifndef ANDROID_SDK
  $(error ANDROID_SDK must be defined before including android-common.mk)
endif

ifndef JAVA_CLASSPATH
  $(error JAVA_CLASSPATH must be defined before including android-common.mk)
endif

# DEBUG_JARSIGNER always debug signs.
DEBUG_JARSIGNER=$(PYTHON) $(abspath $(topsrcdir)/mobile/android/debug_sign_tool.py) \
  --keytool=$(KEYTOOL) \
  --jarsigner=$(JARSIGNER) \
  $(NULL)

# For Android, this defaults to $(ANDROID_SDK)/android.jar
ifndef JAVA_BOOTCLASSPATH
  JAVA_BOOTCLASSPATH = $(ANDROID_SDK)/android.jar:$(ANDROID_COMPAT_LIB)
endif

# For Android, we default to 1.5
ifndef JAVA_VERSION
  JAVA_VERSION = 1.5
endif

JAVAC_FLAGS = \
  -target $(JAVA_VERSION) \
  -source $(JAVA_VERSION) \
  -classpath $(JAVA_CLASSPATH) \
  -bootclasspath $(JAVA_BOOTCLASSPATH) \
  -encoding UTF8 \
  -g:source,lines \
  -Werror \
  $(NULL)
back to top