mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-05 00:25:27 +00:00
c8ee8a09cf
This commit is us getting out of our own way. We were specifying
-classpath twice, once in $(JAVAC) and once in java-build.mk. Only
the latter of these is active. This a problem for ANDROID_EXTRA_JARS
-- those JARs should be on the classpath and input to $(DX) -- and
JARs that should be on the classpath but *not* input to $(DX). This
commit removes the global flags to $(JAVAC) and adds
JAVA_{BOOT}CLASSPATH_JARS. This required some hijinkery moving
wildcards to moz.build files, but everything seems to work.
As well as clarifying some parts of the build, part 2 uses this work
to modify the classpath.
--HG--
extra : commitid : 25Ft0BFs88O
extra : rebase_source : 05e3d1da8d42fa89d06ef48baee17bb77df5bd59
extra : histedit_source : 95b82309aca15c5a3c5f5a0eafbdcf75c5e8dfc0
24 lines
960 B
Makefile
24 lines
960 B
Makefile
# 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/.
|
|
|
|
_DEST_DIR = $(DEPTH)/_tests/instrumentation
|
|
PKG_STAGE = $(DIST)/test-stage
|
|
|
|
include $(topsrcdir)/config/rules.mk
|
|
|
|
# Fennec and all instrumentation tests need to be signed with the same
|
|
# key, which means release signing them all.
|
|
|
|
include $(topsrcdir)/config/android-common.mk
|
|
|
|
stage-package:
|
|
$(NSINSTALL) -D $(_DEST_DIR)
|
|
$(call RELEASE_SIGN_ANDROID_APK,\
|
|
$(DEPTH)/mobile/android/tests/background/junit3/background-junit3-debug-unsigned-unaligned.apk,\
|
|
$(_DEST_DIR)/background-junit3.apk)
|
|
$(call RELEASE_SIGN_ANDROID_APK,\
|
|
$(DEPTH)/mobile/android/tests/browser/junit3/browser-junit3-debug-unsigned-unaligned.apk,\
|
|
$(_DEST_DIR)/browser-junit3.apk)
|
|
@(cd $(DEPTH)/_tests/ && tar $(TAR_CREATE_FLAGS) - instrumentation) | (cd $(PKG_STAGE) && tar -xf -)
|