no bug - Don't harcode the appID in nsAndroidStartup.cpp [r=ted] (from birch)

--HG--
extra : rebase_source : 6b59b4559422af30721f70492bf4cebecb0334ce

config/autoconf.mk.in

@@ -697,3 +697,5 @@ ifeq (1_a,$(.PYMAKE)_$(firstword a$(subst /, ,$(srcdir))))
 $(error MSYS-style srcdir being used with Pymake. Did you mean to run GNU Make instead? [see-also: https://developer.mozilla.org/en/Gmake_vs._Pymake])
 endif
 endif # WINNT
+
+MOZ_APP_ID = @MOZ_APP_ID@

configure.in

@@ -8688,6 +8688,8 @@ AC_SUBST(LIBJPEG_TURBO_ASFLAGS)
 AC_SUBST(LIBJPEG_TURBO_X86_ASM)
 AC_SUBST(LIBJPEG_TURBO_X64_ASM)
 
+AC_SUBST(MOZ_APP_ID)
+
 AC_MSG_CHECKING([for posix_fallocate])
 AC_TRY_LINK([#define _XOPEN_SOURCE 600
   #include <fcntl.h>],

mobile/xul/app/Makefile.in

@@ -105,6 +105,7 @@ DEFINES += -DGRE_MILESTONE=$(GRE_MILESTONE) \
            -DAPP_NAME=$(MOZ_APP_NAME) \
            -DAPP_VERSION=$(MOZ_APP_VERSION) \
            -DMOZ_UPDATER=$(MOZ_UPDATER) \
+           -DAPP_ID=$(MOZ_APP_ID) \
            $(NULL)
 
 ifdef MOZILLA_OFFICIAL

mobile/xul/app/application.ini

@@ -10,7 +10,7 @@ SourceRepository=@MOZ_SOURCE_REPO@
 #ifdef MOZ_SOURCE_STAMP
 SourceStamp=@MOZ_SOURCE_STAMP@
 #endif
-ID={a23983c0-fd0e-11dc-95ff-0800200c9a66}
+ID=@APP_ID@
 
 [Gecko]
 MinVersion=1.9.2b5pre

mobile/xul/confvars.sh

@@ -67,3 +67,5 @@ MOZ_APP_COMPONENT_INCLUDE=nsBrowserComponents.h
 
 # use custom widget for html:select
 MOZ_USE_NATIVE_POPUP_WINDOWS=1
+
+MOZ_APP_ID={a23983c0-fd0e-11dc-95ff-0800200c9a66}

toolkit/xre/Makefile.in

@@ -251,6 +251,8 @@ GRE_BUILDID := $(shell cat $(DEPTH)/config/buildid)
  
 DEFINES += -DGRE_MILESTONE=$(GRE_MILESTONE) -DGRE_BUILDID=$(GRE_BUILDID)
 
+DEFINES += -DAPP_ID=$(MOZ_APP_ID)
+
 $(srcdir)/nsAppRunner.cpp: $(DEPTH)/config/buildid $(topsrcdir)/config/milestone.txt
 
 platform.ini: FORCE