Bug 1160563 - Pre: Allow ANDROID_RES_DIRS that are not relative to srcdir. r=gps, a=sledru
authorNick Alexander <nalexander@mozilla.com>
Mon, 10 Aug 2015 13:18:32 -0700
changeset 289311 fbb02d5e678489003d9587410d807bfe3e1158fa
parent 289310 2d896fd0ad024370e55e1a48075be5fedbc9340a
child 289312 84e994df984952273c452887f1effd7756023707
push id5067
push userraliiev@mozilla.com
push dateMon, 21 Sep 2015 14:04:52 +0000
treeherdermozilla-beta@14221ffe5b2f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps, sledru
bugs1160563
milestone42.0a2
Bug 1160563 - Pre: Allow ANDROID_RES_DIRS that are not relative to srcdir. r=gps, a=sledru
config/makefiles/java-build.mk
--- a/config/makefiles/java-build.mk
+++ b/config/makefiles/java-build.mk
@@ -11,17 +11,17 @@ ifdef JAVAFILES #{
 GENERATED_DIRS += classes
 
 export:: classes
 classes: $(call mkdir_deps,classes)
 endif #} JAVAFILES
 
 
 ifdef ANDROID_APK_NAME #{
-android_res_dirs := $(addprefix $(srcdir)/,$(or $(ANDROID_RES_DIRS),res))
+android_res_dirs := $(or $(ANDROID_RES_DIRS),$(srcdir)/res)
 _ANDROID_RES_FLAG := $(addprefix -S ,$(android_res_dirs))
 _ANDROID_ASSETS_FLAG := $(addprefix -A ,$(ANDROID_ASSETS_DIR))
 android_manifest := $(or $(ANDROID_MANIFEST_FILE),AndroidManifest.xml)
 
 GENERATED_DIRS += classes
 
 classes.dex: $(call mkdir_deps,classes)
 classes.dex: R.java