mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
ec3a0bb18c
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. |
||
---|---|---|
.. | ||
external | ||
makefiles | ||
Moz | ||
tests | ||
android-common.mk | ||
autoconf-js.mk.in | ||
autoconf.mk.in | ||
baseconfig.mk | ||
check_macroassembler_style.py | ||
check_source_count.py | ||
check_spidermonkey_style.py | ||
check_utils.py | ||
check_vanilla_allocations.py | ||
config.mk | ||
configobj.py | ||
createprecomplete.py | ||
doxygen.cfg.in | ||
emptyvars-js.mk.in | ||
emptyvars.mk.in | ||
expandlibs_config.py | ||
expandlibs_exec.py | ||
expandlibs_gen.py | ||
expandlibs.py | ||
find_OOM_errors.py | ||
gcc_hidden.h | ||
gcc-stl-wrapper.template.h | ||
glibcversion.sh | ||
install.bat | ||
link.py | ||
make-stl-wrappers.py | ||
Makefile.in | ||
milestone.txt | ||
moz.build | ||
mozunit.py | ||
MozZipFile.py | ||
msvc-stl-wrapper.template.h | ||
nsinstall.c | ||
nsinstall.py | ||
pathsub.c | ||
pathsub.h | ||
printconfigsetting.py | ||
printprereleasesuffix.py | ||
pythonpath.py | ||
rebuild_check.py | ||
recurse.mk | ||
rules.mk | ||
solaris_ia32.map | ||
static-checking-config.mk | ||
static-checking.js | ||
stl-headers | ||
string-format.js | ||
system-headers | ||
version_win.pl | ||
version.mk |