Don't harcode the appID in nsAndroidStartup.cpp [r=ted]

2024-10-11 12:25:53 +00:00 · 2011-10-24 13:07:33 -07:00 · 2011-10-24 13:07:33 -07:00 · 560b5a4967
commit 560b5a4967
parent e8670cc25d
8 changed files with 12 additions and 3 deletions
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@ -694,3 +694,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@
--- a/configure.in
+++ b/configure.in
@ -8536,6 +8536,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>],
--- a/mobile/app/Makefile.in
+++ b/mobile/app/Makefile.in
@ -97,6 +97,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
--- a/mobile/app/application.ini
+++ b/mobile/app/application.ini
@ -10,7 +10,7 @@ SourceRepository=@MOZ_SOURCE_REPO@
 #ifdef MOZ_SOURCE_STAMP
 SourceStamp=@MOZ_SOURCE_STAMP@
 #endif
-ID={aa3c5121-dab2-40e2-81ca-7ea25febc110}
+ID=@APP_ID@

 [Gecko]
 MinVersion=1.9.2b5pre
--- a/mobile/components/MobileComponents.manifest
+++ b/mobile/components/MobileComponents.manifest
@ -72,7 +72,7 @@ contract @mozilla.org/embedcomp/prompt-service;1 {9a61149b-2276-4a0a-b79c-be994a
 category wakeup-request PromptService @mozilla.org/embedcomp/prompt-service;1,nsIPromptService,getService,Prompt:Call

 # BrowserCLH.js
-component {be623d20-d305-11de-8a39-0800200c9a66} BrowserCLH.js application={a23983c0-fd0e-11dc-95ff-0800200c9a66}
+component {be623d20-d305-11de-8a39-0800200c9a66} BrowserCLH.js application={aa3c5121-dab2-40e2-81ca-7ea25febc110}
 contract @mozilla.org/browser/browser-clh;1 {be623d20-d305-11de-8a39-0800200c9a66}
 category command-line-handler x-browser @mozilla.org/browser/browser-clh;1

--- a/mobile/confvars.sh
+++ b/mobile/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={aa3c5121-dab2-40e2-81ca-7ea25febc110}
--- a/toolkit/xre/Makefile.in
+++ b/toolkit/xre/Makefile.in
@ -257,6 +257,8 @@ endif

 DEFINES += -DAPP_VERSION=$(MOZ_APP_VERSION)

+DEFINES += -DAPP_ID=$(MOZ_APP_ID)
+
 $(srcdir)/nsAppRunner.cpp: $(DEPTH)/config/buildid $(topsrcdir)/config/milestone.txt

 platform.ini: FORCE
--- a/toolkit/xre/nsAndroidStartup.cpp
+++ b/toolkit/xre/nsAndroidStartup.cpp
@ -115,7 +115,7 @@ GeckoStart(void *data)
        "Fennec",
        STR(APP_VERSION),
        STR(GRE_BUILDID),
-        "{a23983c0-fd0e-11dc-95ff-0800200c9a66}",
+        STR(APP_ID),
        NULL,
 #ifdef MOZILLA_OFFICIAL
        NS_XRE_ENABLE_EXTENSION_MANAGER | NS_XRE_ENABLE_CRASH_REPORTER,