wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Back out 705d94f0a11c and c593ef0f4353 (bug 719697) for crazed infra filename dependencies

Browse Source
This commit is contained in:
Phil Ringnalda 2012-01-26 20:16:54 -08:00
parent d8f7904c61
commit 82f5e1a6bb
3 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build/mobile/robocop/Makefile.in
View File

@ -130,6 +130,11 @@ robocop.ap_: AndroidManifest.xml
$(AAPT) package -f -M AndroidManifest.xml -I $(ANDROID_SDK)/android.jar -I . -S res -F $@ -J ./
robocop.apk: robocop.ap_ classes.dex
$(APKBUILDER) robocop-raw.apk -v $(APKBUILDER_FLAGS) -z robocop.ap_ -f classes.dex
ifdef JARSIGNER
$(JARSIGNER) robocop-raw.apk
endif
$(ZIPALIGN) -f -v 4 robocop-raw.apk $@
cp $(TESTPATH)/robocop.ini robocop.ini
cp $(srcdir)/parse_ids.py parse_ids.py

1
testing/testsuite-targets.mk
View File

@ -294,6 +294,7 @@ stage-mochitest: robotium-id-map
stage-mochitest: make-stage-dir
$(MAKE) -C $(DEPTH)/testing/mochitest stage-package
ifeq ($(MOZ_BUILD_APP),mobile/android)
$(NSINSTALL) $(DEPTH)/build/mobile/robocop/robocop.apk $(PKG_STAGE)/bin
$(NSINSTALL) $(DEPTH)/build/mobile/robocop/fennec_ids.txt $(PKG_STAGE)/mochitest
endif

14
toolkit/mozapps/installer/packager.mk
View File

@ -335,16 +335,6 @@ else
GECKO_APP_AP_PATH = $(call core_abspath,$(DEPTH)/mobile/android/base)
endif
INNER_ROBOCOP_PACKAGE=
ifeq ($(MOZ_BUILD_APP),mobile/android)
UPLOAD_EXTRA_FILES += robocop.zip
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.zip
endif
PKG_SUFFIX = .apk
INNER_MAKE_PACKAGE = \
make -C $(GECKO_APP_AP_PATH) gecko.ap_ && \
@ -545,9 +535,9 @@ endif
ifdef MOZ_SIGN_PREPARED_PACKAGE_CMD
MAKE_PACKAGE = $(PREPARE_PACKAGE) && $(MOZ_SIGN_PREPARED_PACKAGE_CMD) \
$(MOZ_PKG_DIR) && $(INNER_MAKE_PACKAGE) $(INNER_ROBOCOP_PACKAGE)
$(MOZ_PKG_DIR) && $(INNER_MAKE_PACKAGE)
else
MAKE_PACKAGE = $(PREPARE_PACKAGE) && $(INNER_MAKE_PACKAGE) $(INNER_ROBOCOP_PACKAGE)
MAKE_PACKAGE = $(PREPARE_PACKAGE) && $(INNER_MAKE_PACKAGE)
endif
ifdef MOZ_SIGN_PACKAGE_CMD