| author | Doug Turner <dougt@dougt.org> |
| Sun, 29 Jan 2012 20:42:00 -0800 | |
| changeset 85686 | e33539a90ae2943e1398b2df19fda3d1f10405d1 |
| parent 85685 | d10da858631ab3a5f133144b1485e825a0dbad86 |
| child 85697 | bfeeb813aef2dfe25a74343034664127d954b274 |
| child 85734 | 3a02c994022dee5513a0dd68b032123e0725e70c |
| child 105625 | 21f1c34fc17a2031505ad8b88c482569dd92b115 |
| push id | 21945 |
| push user | dougt@mozilla.com |
| push date | Mon, 30 Jan 2012 04:42:39 +0000 |
| treeherder | mozilla-central@e33539a90ae2 [default view] [failures only] |
| perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
| reviewers | blassey |
| bugs | 722118 |
| milestone | 12.0a1 |
| first release with | nightly linux32
e33539a90ae2
/
12.0a1
/
20120130031142
/
files
nightly linux64
e33539a90ae2
/
12.0a1
/
20120130031142
/
files
nightly mac
e33539a90ae2
/
12.0a1
/
20120130031142
/
files
nightly win32
e33539a90ae2
/
12.0a1
/
20120130031142
/
files
nightly win64
e33539a90ae2
/
12.0a1
/
20120130031142
/
files
|
| last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
| releases | nightly linux32
12.0a1
/
20120130031142
/
pushlog to previous
nightly linux64
12.0a1
/
20120130031142
/
pushlog to previous
nightly mac
12.0a1
/
20120130031142
/
pushlog to previous
nightly win32
12.0a1
/
20120130031142
/
pushlog to previous
nightly win64
12.0a1
/
20120130031142
/
pushlog to previous
|
--- a/toolkit/mozapps/installer/packager.mk +++ b/toolkit/mozapps/installer/packager.mk @@ -330,25 +330,29 @@ endif endif ifneq (,$(filter mobile/xul b2g,$(MOZ_BUILD_APP))) GECKO_APP_AP_PATH = $(call core_abspath,$(DEPTH)/embedding/android) else GECKO_APP_AP_PATH = $(call core_abspath,$(DEPTH)/mobile/android/base) endif +ifdef ENABLE_TESTS INNER_ROBOCOP_PACKAGE=echo ifeq ($(MOZ_BUILD_APP),mobile/android) UPLOAD_EXTRA_FILES += robocop.apk ROBOCOP_PATH = $(call core_abspath,$(_ABS_DIST)/../build/mobile/robocop) INNER_ROBOCOP_PACKAGE= \ $(APKBUILDER) $(_ABS_DIST)/robocop-raw.apk -v $(APKBUILDER_FLAGS) -z $(ROBOCOP_PATH)/robocop.ap_ -f $(ROBOCOP_PATH)/classes.dex && \ $(JARSIGNER) $(_ABS_DIST)/robocop-raw.apk && \ $(ZIPALIGN) -f -v 4 $(_ABS_DIST)/robocop-raw.apk $(_ABS_DIST)/robocop.apk endif +else +INNER_ROBOCOP_PACKAGE=echo 'Testing is disabled - No Robocop for you' +endif PKG_SUFFIX = .apk INNER_MAKE_PACKAGE = \ make -C $(GECKO_APP_AP_PATH) gecko.ap_ && \ cp $(GECKO_APP_AP_PATH)/gecko.ap_ $(_ABS_DIST) && \ ( cd $(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH) && \ mkdir -p lib/$(ABI_DIR) && \ mv libmozglue.so $(MOZ_CHILD_PROCESS_NAME) lib/$(ABI_DIR) && \