Bug 1317880 - Move adjust and thirdparty jars into GECKOVIEW_JARS to fix annotation processing r=sebastian
authorAndrzej Hunt <ahunt@mozilla.com>
Wed, 16 Nov 2016 15:30:16 +0800
changeset 439706 6b7c1986d7ecc870c32e10b44f1a128b41f44c59
parent 439705 163281db1563a70e3e9c15669c67d478d2223991
child 439707 2598a93e2e1a27f363af9fdd290cf4184cc51d48
child 440125 2e0ae44e91ae9e33775da15551242a2df49dcb28
push id36064
push userrthijssen@mozilla.com
push dateWed, 16 Nov 2016 13:38:27 +0000
reviewerssebastian
bugs1317880
milestone53.0a1
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
mobile/android/base/Makefile.in
--- a/mobile/android/base/Makefile.in
+++ b/mobile/android/base/Makefile.in
@@ -150,44 +150,44 @@ java_bundled_libs := $(call uniq,$(java_
 java_bundled_libs := $(subst $(NULL) ,:,$(strip $(java_bundled_libs)))
 
 GECKOVIEW_JARS = \
   constants.jar \
   gecko-R.jar \
   gecko-mozglue.jar \
   gecko-util.jar \
   gecko-view.jar \
+  sync-thirdparty.jar \
   $(NULL)
 
+ifdef MOZ_INSTALL_TRACKING
+GECKOVIEW_JARS += gecko-thirdparty-adjust_sdk.jar
+endif
+
 geckoview_jars_classpath := $(subst $(NULL) ,:,$(strip $(GECKOVIEW_JARS)))
 
 FENNEC_JARS = \
   gecko-browser.jar \
   gecko-thirdparty.jar \
   services.jar \
-  sync-thirdparty.jar \
   ../javaaddons/javaaddons-1.0.jar \
   $(NULL)
 
 ifdef MOZ_WEBRTC
 FENNEC_JARS += webrtc.jar
 endif
 
 ifdef MOZ_ANDROID_SEARCH_ACTIVITY
 FENNEC_JARS += search-activity.jar
 endif
 
 ifdef MOZ_ANDROID_MLS_STUMBLER
 FENNEC_JARS += ../stumbler/stumbler.jar
 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
 # java_bundled_libs, which holds the jars which we're including as binaries).
 ALL_JARS = \
   $(GECKOVIEW_JARS) \
   $(FENNEC_JARS) \
   $(NULL)
 
 # The list of jars in Java classpath notation (colon-separated).