bug 549751 - two targets for testing/mochitests/Makefile causes pymake to faile r=mfinkle
authorBrad Lassey <blassey@mozilla.com>
Thu, 04 Mar 2010 00:46:45 -0500
changeset 66032 27d8832893aef37e13949b05c6ce05c22c3a823e
parent 66031 9b5ea1de90525c6deb6ac7977bee2ac8296b4aea
child 66033 ad3d36c16bb2ca909a8fb918ea3e48cab64d7a24
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmfinkle
bugs549751
bug 549751 - two targets for testing/mochitests/Makefile causes pymake to faile r=mfinkle
mobile/build.mk
--- a/mobile/build.mk
+++ b/mobile/build.mk
@@ -32,34 +32,35 @@
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
 ifndef LIBXUL_SDK
 include $(topsrcdir)/toolkit/toolkit-tiers.mk
+else
+ifdef ENABLE_TESTS
+tier_testharness_dirs += \
+  testing/mochitest \
+  $(NULL)
+endif
 endif
 
 TIERS += app
 
 ifdef MOZ_EXTENSIONS
 tier_app_dirs += extensions
 endif
 
 tier_app_dirs += \
   $(MOZ_BRANDING_DIRECTORY) \
   mobile \
   $(NULL)
 
-ifdef ENABLE_TESTS
-tier_testharness_dirs += \
-  testing/mochitest \
-  $(NULL)
-endif
 
 installer: 
 	@$(MAKE) -C mobile/installer installer
 
 package:
 	@rm -rf dist/fennec*
 ifeq ($(OS_ARCH),WINCE)
 	@$(MAKE) -C mobile/installer installer