author | Gregory Szorc <gps@mozilla.com> |
Mon, 25 Feb 2013 12:47:23 -0800 | |
changeset 123319 | 93e83b5951dc28384d7e4a31f55686fb46a2f1fc |
parent 123318 | d1a83f27351b6136f8e8347112c6d03aa2cb1c2c |
child 123320 | 5cb8bcab09cc4d9aac938794fd09ae5ccc4fcf09 |
push id | 23787 |
push user | Ms2ger@gmail.com |
push date | Thu, 28 Feb 2013 17:37:42 +0000 |
treeherder | mozilla-inbound@c65d59d33aa8 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | ted |
bugs | 784841 |
milestone | 22.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/mobile/android/Makefile.in +++ b/mobile/android/Makefile.in @@ -4,21 +4,15 @@ DEPTH = @DEPTH@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = ../locales locales base chrome components modules themes/core app fonts - -ifndef LIBXUL_SDK -PARALLEL_DIRS += $(DEPTH)/xulrunner/tools/redit -endif - include $(topsrcdir)/config/rules.mk include $(topsrcdir)/testing/testsuite-targets.mk package-mobile-tests: $(MAKE) stage-mochitest DIST_BIN=$(DEPTH)/$(DIST)/bin/xulrunner $(NSINSTALL) -D $(DIST)/$(PKG_PATH) @(cd $(PKG_STAGE) && tar $(TAR_CREATE_FLAGS) - *) | bzip2 -f > $(DIST)/$(PKG_PATH)$(TEST_PACKAGE)
new file mode 100644 --- /dev/null +++ b/mobile/android/app.mozbuild @@ -0,0 +1,18 @@ +# 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 not CONFIG['LIBXUL_SDK']: + app_libxul_dirs = ['mobile/android/components/build'] + + include('/toolkit/toolkit.mozbuild') + +elif CONFIG['ENABLE_TESTS']: + add_tier_dir('testharness', 'testing/mochitest') + +if CONFIG['MOZ_EXTENSIONS']: + add_tier_dir('app', 'extensions') + +add_tier_dir('app', CONFIG['MOZ_BRANDING_DIRECTORY']) +add_tier_dir('app', 'mobile/android')
--- a/mobile/android/app/Makefile.in +++ b/mobile/android/app/Makefile.in @@ -4,17 +4,16 @@ DEPTH = @DEPTH@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = profile/extensions dist_dest = $(DIST)/$(APP_NAME).app PREF_JS_EXPORTS = $(srcdir)/mobile.js DIST_FILES = recommended-addons.json ifndef LIBXUL_SDK ifneq (Android,$(OS_TARGET)) PROGRAM=$(MOZ_APP_NAME)$(BIN_SUFFIX)
new file mode 100644 --- /dev/null +++ b/mobile/android/app/moz.build @@ -0,0 +1,6 @@ +# 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/. + +DIRS += ['profile/extensions']
new file mode 100644 --- /dev/null +++ b/mobile/android/app/profile/extensions/moz.build @@ -0,0 +1,5 @@ +# 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/. +
--- a/mobile/android/base/Makefile.in +++ b/mobile/android/base/Makefile.in @@ -5,18 +5,16 @@ DEPTH = @DEPTH@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk include $(topsrcdir)/ipc/app/defs.mk -DIRS = locales - DIST_FILES = package-name.txt include $(topsrcdir)/mobile/android/base/android-services-files.mk MOZGLUE_JAVA_FILES := \ mozglue/DirectBufferAllocator.java \ $(NULL)
new file mode 100644 --- /dev/null +++ b/mobile/android/base/locales/moz.build @@ -0,0 +1,5 @@ +# 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/. +
new file mode 100644 --- /dev/null +++ b/mobile/android/base/moz.build @@ -0,0 +1,6 @@ +# 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/. + +DIRS += ['locales']
--- a/mobile/android/branding/aurora/Makefile.in +++ b/mobile/android/branding/aurora/Makefile.in @@ -3,15 +3,9 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. DEPTH = @DEPTH@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk - -DIRS = \ - content \ - locales \ - $(NULL) - include $(topsrcdir)/config/rules.mk
new file mode 100644 --- /dev/null +++ b/mobile/android/branding/aurora/content/moz.build @@ -0,0 +1,5 @@ +# 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/. +
new file mode 100644 --- /dev/null +++ b/mobile/android/branding/aurora/locales/moz.build @@ -0,0 +1,5 @@ +# 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/. +
new file mode 100644 --- /dev/null +++ b/mobile/android/branding/aurora/moz.build @@ -0,0 +1,6 @@ +# 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/. + +DIRS += ['content', 'locales']
--- a/mobile/android/branding/beta/Makefile.in +++ b/mobile/android/branding/beta/Makefile.in @@ -3,15 +3,9 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. DEPTH = @DEPTH@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk - -DIRS = \ - content \ - locales \ - $(NULL) - include $(topsrcdir)/config/rules.mk
new file mode 100644 --- /dev/null +++ b/mobile/android/branding/beta/content/moz.build @@ -0,0 +1,5 @@ +# 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/. +
new file mode 100644 --- /dev/null +++ b/mobile/android/branding/beta/locales/moz.build @@ -0,0 +1,5 @@ +# 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/. +
new file mode 100644 --- /dev/null +++ b/mobile/android/branding/beta/moz.build @@ -0,0 +1,6 @@ +# 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/. + +DIRS += ['content', 'locales']
--- a/mobile/android/branding/nightly/Makefile.in +++ b/mobile/android/branding/nightly/Makefile.in @@ -3,15 +3,9 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. DEPTH = @DEPTH@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk - -DIRS = \ - content \ - locales \ - $(NULL) - include $(topsrcdir)/config/rules.mk
new file mode 100644 --- /dev/null +++ b/mobile/android/branding/nightly/content/moz.build @@ -0,0 +1,5 @@ +# 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/. +
new file mode 100644 --- /dev/null +++ b/mobile/android/branding/nightly/locales/moz.build @@ -0,0 +1,5 @@ +# 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/. +
new file mode 100644 --- /dev/null +++ b/mobile/android/branding/nightly/moz.build @@ -0,0 +1,6 @@ +# 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/. + +DIRS += ['content', 'locales']
--- a/mobile/android/branding/official/Makefile.in +++ b/mobile/android/branding/official/Makefile.in @@ -3,15 +3,9 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. DEPTH = @DEPTH@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk - -DIRS = \ - content \ - locales \ - $(NULL) - include $(topsrcdir)/config/rules.mk
new file mode 100644 --- /dev/null +++ b/mobile/android/branding/official/content/moz.build @@ -0,0 +1,5 @@ +# 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/. +
new file mode 100644 --- /dev/null +++ b/mobile/android/branding/official/locales/moz.build @@ -0,0 +1,5 @@ +# 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/. +
new file mode 100644 --- /dev/null +++ b/mobile/android/branding/official/moz.build @@ -0,0 +1,6 @@ +# 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/. + +DIRS += ['content', 'locales']
--- a/mobile/android/branding/unofficial/Makefile.in +++ b/mobile/android/branding/unofficial/Makefile.in @@ -3,15 +3,9 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. DEPTH = @DEPTH@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk - -DIRS = \ - content \ - locales \ - $(NULL) - include $(topsrcdir)/config/rules.mk
new file mode 100644 --- /dev/null +++ b/mobile/android/branding/unofficial/content/moz.build @@ -0,0 +1,5 @@ +# 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/. +
new file mode 100644 --- /dev/null +++ b/mobile/android/branding/unofficial/locales/moz.build @@ -0,0 +1,5 @@ +# 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/. +
new file mode 100644 --- /dev/null +++ b/mobile/android/branding/unofficial/moz.build @@ -0,0 +1,6 @@ +# 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/. + +DIRS += ['content', 'locales']
--- a/mobile/android/build.mk +++ b/mobile/android/build.mk @@ -1,39 +1,14 @@ # 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/. -ifndef LIBXUL_SDK -# Needed for building our components as part of libxul -APP_LIBXUL_DIRS += mobile/android/components/build - -include $(topsrcdir)/toolkit/toolkit-tiers.mk -else -ifdef ENABLE_TESTS -tier_testharness_dirs += \ - testing/mochitest \ - $(NULL) -endif -endif - include $(topsrcdir)/toolkit/mozapps/installer/package-name.mk -TIERS += app - -ifdef MOZ_EXTENSIONS -tier_app_dirs += extensions -endif - -tier_app_dirs += \ - $(MOZ_BRANDING_DIRECTORY) \ - mobile/android \ - $(NULL) - - installer: @$(MAKE) -C mobile/android/installer installer package: @$(MAKE) -C mobile/android/installer fast-package: @$(MAKE) package MOZ_FAST_PACKAGE=1
new file mode 100644 --- /dev/null +++ b/mobile/android/chrome/moz.build @@ -0,0 +1,5 @@ +# 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/. +
new file mode 100644 --- /dev/null +++ b/mobile/android/components/build/moz.build @@ -0,0 +1,5 @@ +# 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/. +
new file mode 100644 --- /dev/null +++ b/mobile/android/components/moz.build @@ -0,0 +1,5 @@ +# 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/. +
new file mode 100644 --- /dev/null +++ b/mobile/android/fonts/moz.build @@ -0,0 +1,5 @@ +# 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/. +
--- a/mobile/android/installer/Makefile.in +++ b/mobile/android/installer/Makefile.in @@ -4,16 +4,18 @@ DEPTH = @DEPTH@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk +STANDALONE_MAKEFILE := 1 + # overwrite mobile-l10n.js with a matchOS=true one for multi-locale builds ifeq ($(AB_CD),multi) PREF_JS_EXPORTS = $(srcdir)/mobile-l10n.js endif include $(topsrcdir)/config/rules.mk MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in
new file mode 100644 --- /dev/null +++ b/mobile/android/installer/moz.build @@ -0,0 +1,5 @@ +# 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/. +
new file mode 100644 --- /dev/null +++ b/mobile/android/locales/moz.build @@ -0,0 +1,5 @@ +# 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/. +
new file mode 100644 --- /dev/null +++ b/mobile/android/modules/moz.build @@ -0,0 +1,5 @@ +# 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/. +
new file mode 100644 --- /dev/null +++ b/mobile/android/moz.build @@ -0,0 +1,22 @@ +# 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 += ['installer/Makefile'] + +DIRS += [ + '../locales', + 'locales', + 'base', + 'chrome', + 'components', + 'modules', + 'themes/core', + 'app', + 'fonts', +] + +if not CONFIG['LIBXUL_SDK']: + PARALLEL_DIRS += ['../../xulrunner/tools/redit'] +
new file mode 100644 --- /dev/null +++ b/mobile/android/themes/core/moz.build @@ -0,0 +1,5 @@ +# 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/. +