Commit a8fd11ad authored by Nick Alexander's avatar Nick Alexander
Browse files

Bug 1411654 - Post: Cull unused variables; guard more with...

Bug 1411654 - Post: Cull unused variables; guard more with MOZ_BUILD_MOBILE_ANDROID_WITH_GRADLE. r=maliu

MozReview-Commit-ID: 8EGzVISIEQZ

--HG--
extra : rebase_source : 300f6a6656b87a4b487ec7ec331446b326371665
extra : source : cfad693be9185ae858a29a715b3e5a6d2d3d6fbf
parent f452e71d
......@@ -27,6 +27,8 @@ GARBAGE_DIRS += classes db jars res sync services generated
gradle_dir := $(topobjdir)/gradle/build/mobile/android
ifndef MOZ_BUILD_MOBILE_ANDROID_WITH_GRADLE
# The bootclasspath is functionally identical to the classpath, but allows the
# classes given to redefine classes in core packages, such as java.lang.
# android.jar is here as it provides Android's definition of the Java Standard
......@@ -153,7 +155,6 @@ uniq = $(if $1,$(firstword $1) $(call uniq,$(filter-out $(firstword $1),$1)))
java_bundled_libs := $(call uniq,$(java_bundled_libs))
java_bundled_libs := $(subst $(NULL) ,:,$(strip $(java_bundled_libs)))
ifndef MOZ_BUILD_MOBILE_ANDROID_WITH_GRADLE
GECKOVIEW_JARS = \
constants.jar \
gecko-R.jar \
......@@ -185,16 +186,6 @@ ifdef MOZ_ANDROID_MLS_STUMBLER
FENNEC_JARS += ../stumbler/stumbler.jar
endif
else # MOZ_BUILD_MOBILE_ANDROID_WITH_GRADLE
GECKOVIEW_JARS := $(gradle_dir)/geckoview/intermediates/bundles/debug/classes.jar
FENNEC_JARS := $(gradle_dir)/app/intermediates/packaged/officialPhoton/debug/classes.jar
$(GECKOVIEW_JARS): .gradle.deps
$(FENNEC_JARS): .gradle.deps
endif # MOZ_BUILD_MOBILE_ANDROID_WITH_GRADLE
geckoview_jars_classpath := $(subst $(NULL) ,:,$(strip $(GECKOVIEW_JARS)))
# All the jars we're compiling from source. (not to be confused with
......@@ -242,6 +233,8 @@ endif # MOZ_INSTALL_TRACKING
library_jars := $(subst $(NULL) ,:,$(strip $(library_jars)))
endif # MOZ_BUILD_MOBILE_ANDROID_WITH_GRADLE
ifdef MOZ_BUILD_MOBILE_ANDROID_WITH_GRADLE
define gradle_command
$(1): $(2)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment