Bug 1330875 - Remove MOZ_APP_STATIC_INI. r=mshal

It's now always set, even on comm-central, so we can just remote it.

--HG--
extra : rebase_source : 8687e2f3b8636fb79564d074d2cce2e088570413

b2g/confvars.sh

@@ -18,7 +18,6 @@ MOZ_OFFICIAL_BRANDING_DIRECTORY=b2g/branding/official
 # MOZ_APP_DISPLAYNAME is set by branding/configure.sh
 
 MOZ_NO_SMART_CARDS=1
-MOZ_APP_STATIC_INI=1
 
 if test "$OS_TARGET" = "Android"; then
 MOZ_CAPTURE=1

b2g/graphene/confvars.sh

@@ -27,7 +27,6 @@ MOZ_OFFICIAL_BRANDING_DIRECTORY=b2g/branding/official
 MOZ_CAPTIVEDETECT=1
 
 MOZ_NO_SMART_CARDS=1
-MOZ_APP_STATIC_INI=1
 NSS_NO_LIBPKIX=1
 
 if test "$OS_TARGET" = "Android"; then

browser/confvars.sh

@@ -55,7 +55,6 @@ ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-central
 # The MAR_CHANNEL_ID must not contain the following 3 characters: ",\t "
 MAR_CHANNEL_ID=firefox-mozilla-central
 MOZ_PROFILE_MIGRATOR=1
-MOZ_APP_STATIC_INI=1
 MOZ_WEBGL_CONFORMANT=1
 MOZ_JSDOWNLOADS=1
 MOZ_RUST_MP4PARSE=1

build/application.ini.in

@@ -1,4 +1,3 @@
-#if MOZ_APP_STATIC_INI
 #ifdef MOZ_BUILD_APP_IS_BROWSER
 ; This file is not used. If you modify it and want the application to use
 ; your modifications, move it under the browser/ subdirectory and start with
@@ -8,7 +7,6 @@
 ; your modifications, start with the "-app /path/to/application.ini"
 ; argument.
 #endif
-#endif
 #if 0
 ; This Source Code Form is subject to the terms of the Mozilla Public
 ; License, v. 2.0. If a copy of the MPL was not distributed with this

build/moz.build

@@ -64,8 +64,7 @@ if CONFIG['MOZ_APP_BASENAME']:
     if CONFIG['MOZ_APP_PROFILE']:
         appini_defines['MOZ_APP_PROFILE'] = CONFIG['MOZ_APP_PROFILE']
 
-    for var in ('MOZ_CRASHREPORTER', 'MOZ_PROFILE_MIGRATOR',
-                'MOZ_APP_STATIC_INI'):
+    for var in ('MOZ_CRASHREPORTER', 'MOZ_PROFILE_MIGRATOR'):
         if CONFIG[var]:
             appini_defines[var] = True
 
@@ -80,11 +79,10 @@ if CONFIG['MOZ_APP_BASENAME']:
     if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android' and CONFIG['MOZ_UPDATER']:
         FINAL_TARGET_PP_FILES += ['update-settings.ini']
 
-    if CONFIG['MOZ_APP_STATIC_INI']:
-        GENERATED_FILES += ['application.ini.h']
-        appini = GENERATED_FILES['application.ini.h']
-        appini.script = 'appini_header.py'
-        appini.inputs = ['!application.ini']
+    GENERATED_FILES += ['application.ini.h']
+    appini = GENERATED_FILES['application.ini.h']
+    appini.script = 'appini_header.py'
+    appini.inputs = ['!application.ini']
 
 # NOTE: Keep .gdbinit in the topsrcdir for people who run gdb from the topsrcdir.
 OBJDIR_FILES += ['/.gdbinit']

mobile/android/confvars.sh

@@ -37,8 +37,6 @@ MOZ_USE_NATIVE_POPUP_WINDOWS=1
 
 MOZ_APP_ID={aa3c5121-dab2-40e2-81ca-7ea25febc110}
 
-MOZ_APP_STATIC_INI=1
-
 # Enable second screen using native Android libraries.
 MOZ_NATIVE_DEVICES=1
 

old-configure.in

@@ -5318,8 +5318,6 @@ if test -n "$MOZ_UA_OS_AGNOSTIC"; then
   AC_DEFINE(MOZ_UA_OS_AGNOSTIC)
 fi
 
-AC_SUBST(MOZ_APP_STATIC_INI)
-
 AC_SUBST(MOZ_PKG_SPECIAL)
 AC_SUBST(MOZ_SIMPLE_PACKAGE_NAME)