Bug 1060705 - Part 1: Expose stumbler jar to Robocop. r=garvank, a=lsblakk
authorNick Alexander <nalexander@mozilla.com>
Fri, 31 Oct 2014 10:05:00 -0400
changeset 233990 2021188a2a6fec848800eb1825b3209372dbfc33
parent 233989 12ac3ce023bf298fd6eba82ff2facea894c007a3
child 233991 6d94afe87507faaad3cfbc661ef9a3f68772d62d
push id4187
push userbhearsum@mozilla.com
push dateFri, 28 Nov 2014 15:29:12 +0000
treeherdermozilla-beta@f23cc6a30c11 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgarvank, lsblakk
bugs1060705
milestone35.0a2
Bug 1060705 - Part 1: Expose stumbler jar to Robocop. r=garvank, a=lsblakk
build/mobile/robocop/Makefile.in
--- a/build/mobile/robocop/Makefile.in
+++ b/build/mobile/robocop/Makefile.in
@@ -84,13 +84,15 @@ include $(topsrcdir)/config/rules.mk
 
 tools:: $(ANDROID_APK_NAME).apk
 
 GENERATED_DIRS += $(dir-tests)
 
 # The test APK needs to know the contents of the target APK while not
 # being linked against them.  This is a best effort to avoid getting
 # out of sync with base's build config.
-JARS_DIR := $(DEPTH)/mobile/android/base
-JAVA_BOOTCLASSPATH := $(JAVA_BOOTCLASSPATH):$(subst $(NULL) ,:,$(wildcard $(JARS_DIR)/*.jar)):$(ANDROID_COMPAT_LIB)
+jars_dir := $(DEPTH)/mobile/android/base
+stumbler_jars_dir := $(DEPTH)/mobile/android/stumbler
+JAVA_BOOTCLASSPATH := $(JAVA_BOOTCLASSPATH):$(subst $(NULL) ,:,$(wildcard $(jars_dir)/*.jar)):$(subst $(NULL) ,:,$(wildcard $(stumbler_jars_dir)/*.jar)):$(ANDROID_COMPAT_LIB)
 # We also want to re-compile classes.dex when the associated base
 # content changes.
-classes.dex: $(wildcard $(JARS_DIR)/*.jar)
+classes.dex: $(wildcard $(jars_dir)/*.jar)
+classes.dex: $(wildcard $(stumbler_jars_dir)/*.jar)