Bug 983439 - Ignore mercurial merge conflict files in resources. r=nalexander
authorBrad Lassey <blassey@mozilla.com>
Fri, 14 Mar 2014 15:19:57 -0700
changeset 173737 be3ab4f30410
parent 173736 3ee3e227a0c0
child 173738 943e3906d00f
push id26417
push userphilringnalda@gmail.com
push date2014-03-15 18:52 +0000
treeherdermozilla-central@1867e649a0af [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnalexander
bugs983439
milestone30.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 983439 - Ignore mercurial merge conflict files in resources. r=nalexander DONTBUILD
mobile/android/base/Makefile.in
--- a/mobile/android/base/Makefile.in
+++ b/mobile/android/base/Makefile.in
@@ -177,16 +177,18 @@ preprocessed_package_KEEP_PATH := 1
 PP_TARGETS += preprocessed_package
 
 include $(topsrcdir)/config/rules.mk
 
 not_android_res_files := \
   *.mkdir.done* \
   *.DS_Store* \
   *\#* \
+  *.rej \
+  *.orig \
   $(NULL)
 
 # This uses the fact that Android resource directories list all
 # resource files one subdirectory below the parent resource directory.
 android_res_files := $(filter-out $(not_android_res_files),$(wildcard $(addsuffix /*,$(wildcard $(addsuffix /*,$(ANDROID_RES_DIRS))))))
 
 $(ANDROID_GENERATED_RESFILES): $(call mkdir_deps,$(sort $(dir $(ANDROID_GENERATED_RESFILES))))
 
@@ -248,19 +250,20 @@ R.txt: .aapt.deps ;
 
 gecko-nodeps/R.java: .aapt.nodeps ;
 gecko-nodeps.ap_: .aapt.nodeps ;
 gecko-nodeps/R.txt: .aapt.nodeps ;
 
 # This ignores the default set of resources ignored by aapt, plus
 # files starting with '#'.  (Emacs produces temp files named #temp#.)
 # This doesn't actually set the environment variable; it's used as a
-# parameter in the aapt invocation below.
+# parameter in the aapt invocation below.  Consider updating
+# not_android_res_files as well.
 
-ANDROID_AAPT_IGNORE := !.svn:!.git:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*.scc:*~:\#*
+ANDROID_AAPT_IGNORE := !.svn:!.git:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*.scc:*~:\#*:*.rej:*.orig
 
 # 1: target file.
 # 2: dependencies.
 # 3: name of ap_ file to write.
 # 4: directory to write R.java into.
 # 5: directory to write R.txt into.
 # We touch the target file before invoking aapt so that aapt's outputs
 # are fresher than the target, preventing a subsequent invocation from