Bug 1317880 - Move adjust and thirdparty jars into GECKOVIEW_JARS to fix annotation processing on a CLOSED TREE r=sebastian, a=gchang
authorAndrzej Hunt <ahunt@mozilla.com>
Wed, 16 Nov 2016 15:30:16 +0800
changeset 358828 d84659c9d9292b7b777b97b3cf6410958d2d7478
parent 358827 b896c64a32433508bd5ee22b8ebea2d2e74fd208
child 358829 a8b5c9cb7c5db931bab7a8bbdf09dd99fcdb7075
push id1324
push usermtabara@mozilla.com
push dateMon, 16 Jan 2017 13:07:44 +0000
treeherdermozilla-release@a01c49833940 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssebastian, gchang
bugs1317880
milestone51.0
Bug 1317880 - Move adjust and thirdparty jars into GECKOVIEW_JARS to fix annotation processing on a CLOSED TREE r=sebastian, a=gchang 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
@@ -146,44 +146,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).