зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1317880 - Move adjust and thirdparty jars into GECKOVIEW_JARS to fix annotation processing r=sebastian
GECKOVIEW_JARS contains two Adjust classes (within constants.jar). These depend on the rest of adjust, which was previously within FENNEC_JARS. Without the remaining adjust jars being on the classpath during annotation processing for GECKOVIEW_JARS, we are unable to correctly process those Adjust classes (i.e. we get a NoClassDefFoundError). The minimal fix is to process adjust as part of GECKOVIEW_JARS. Because adjust depends on HttpClientLib, we also need to move the relevant jars into GECKOVIEW_JARS too (sync-thirparty contains HttpClientLib). This will probably require further untangling, this is a minimal patch to allow beta to actually build. MozReview-Commit-ID: DLtazTrg3hV --HG-- extra : rebase_source : ce4ecd7941cb34a9f430ea3da906f7d67775c4d2
This commit is contained in:
Родитель
36948f7dc3
Коммит
ba8e43c22a
|
@ -155,15 +155,19 @@ GECKOVIEW_JARS = \
|
||||||
gecko-mozglue.jar \
|
gecko-mozglue.jar \
|
||||||
gecko-util.jar \
|
gecko-util.jar \
|
||||||
gecko-view.jar \
|
gecko-view.jar \
|
||||||
|
sync-thirdparty.jar \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
|
ifdef MOZ_INSTALL_TRACKING
|
||||||
|
GECKOVIEW_JARS += gecko-thirdparty-adjust_sdk.jar
|
||||||
|
endif
|
||||||
|
|
||||||
geckoview_jars_classpath := $(subst $(NULL) ,:,$(strip $(GECKOVIEW_JARS)))
|
geckoview_jars_classpath := $(subst $(NULL) ,:,$(strip $(GECKOVIEW_JARS)))
|
||||||
|
|
||||||
FENNEC_JARS = \
|
FENNEC_JARS = \
|
||||||
gecko-browser.jar \
|
gecko-browser.jar \
|
||||||
gecko-thirdparty.jar \
|
gecko-thirdparty.jar \
|
||||||
services.jar \
|
services.jar \
|
||||||
sync-thirdparty.jar \
|
|
||||||
../javaaddons/javaaddons-1.0.jar \
|
../javaaddons/javaaddons-1.0.jar \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
|
@ -179,10 +183,6 @@ ifdef MOZ_ANDROID_MLS_STUMBLER
|
||||||
FENNEC_JARS += ../stumbler/stumbler.jar
|
FENNEC_JARS += ../stumbler/stumbler.jar
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifdef MOZ_INSTALL_TRACKING
|
|
||||||
FENNEC_JARS += gecko-thirdparty-adjust_sdk.jar
|
|
||||||
endif
|
|
||||||
|
|
||||||
# All the jars we're compiling from source. (not to be confused with
|
# All the jars we're compiling from source. (not to be confused with
|
||||||
# java_bundled_libs, which holds the jars which we're including as binaries).
|
# java_bundled_libs, which holds the jars which we're including as binaries).
|
||||||
ALL_JARS = \
|
ALL_JARS = \
|
||||||
|
|
Загрузка…
Ссылка в новой задаче