Bug 806343 - Avoid empty define for MOZ_PKG_SPECIAL r=blassey a=lsblakk
authorJames Willcox <jwillcox@mozilla.com>
Mon, 29 Oct 2012 13:48:16 -0400
changeset 116455 4021cc0039bbc249f9ac1492763cf28409ef0f19
parent 116454 931c7345d861bb0966b1ee0229b92eb65fa3b03c
child 116456 1c97386827967be5fece65fc3551d0581b3a6351
push id1708
push userakeybl@mozilla.com
push dateMon, 19 Nov 2012 21:10:21 +0000
treeherdermozilla-beta@27b14fe50103 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersblassey, lsblakk
bugs806343
milestone18.0a2
Bug 806343 - Avoid empty define for MOZ_PKG_SPECIAL r=blassey a=lsblakk
mobile/android/base/Makefile.in
--- a/mobile/android/base/Makefile.in
+++ b/mobile/android/base/Makefile.in
@@ -258,19 +258,22 @@ DEFINES += \
   -DMOZ_UPDATE_CHANNEL=$(MOZ_UPDATE_CHANNEL) \
   -DANDROID_VERSION_CODE=$(ANDROID_VERSION_CODE) \
   -DMOZILLA_OFFICIAL=$(MOZILLA_OFFICIAL) \
   -DUA_BUILDID=$(UA_BUILDID) \
   -DMOZ_APP_BASENAME=$(MOZ_APP_BASENAME) \
   -DMOZ_APP_BUILDID=$(MOZ_APP_BUILDID) \
   -DMOZ_APP_ABI=$(TARGET_XPCOM_ABI) \
   -DMOZ_UPDATER=$(MOZ_UPDATER) \
-  -DMOZ_PKG_SPECIAL=$(MOZ_PKG_SPECIAL) \
   $(NULL)
 
+ifdef MOZ_PKG_SPECIAL
+DEFINES += -DMOZ_PKG_SPECIAL=$(MOZ_PKG_SPECIAL)
+endif
+
 ifdef MOZ_LINKER_EXTRACT
 DEFINES += -DMOZ_LINKER_EXTRACT=1
 endif
 
 GARBAGE += \
   AndroidManifest.xml  \
   classes.dex  \
   $(FENNEC_PP_JAVA_FILES) \