From 1fbd4d95796ff084e84e4b9e32d1c23aa2672825 Mon Sep 17 00:00:00 2001
From: "Matt A. Tobin" <email@mattatobin.com>
Date: Sat, 5 May 2018 15:09:57 -0400
Subject: Use application specific application.ini

---
 build/moz.build | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

(limited to 'build/moz.build')

diff --git a/build/moz.build b/build/moz.build
index d96724cad..616a64c3f 100644
--- a/build/moz.build
+++ b/build/moz.build
@@ -18,9 +18,15 @@ else:
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
     DIRS += ['annotationProcessors']
 
-for var in ('GRE_MILESTONE', 'MOZ_APP_VERSION', 'MOZ_APP_BASENAME',
-            'MOZ_APP_VENDOR', 'MOZ_APP_ID', 'MAR_CHANNEL_ID',
-            'ACCEPTED_MAR_CHANNEL_IDS', 'MOZ_APP_REMOTINGNAME'):
+for var in ('GRE_MILESTONE',
+            'MOZ_APP_VERSION',
+            'MOZ_APP_BASENAME',
+            'MOZ_APP_VENDOR',
+            'MOZ_APP_ID',
+            'MAR_CHANNEL_ID',
+            'ACCEPTED_MAR_CHANNEL_IDS',
+            'MOZ_APP_REMOTINGNAME',
+            'MOZ_BUILD_APP'):
     DEFINES[var] = CONFIG[var]
 
 if CONFIG['MOZ_APP_DISPLAYNAME'] != CONFIG['MOZ_APP_BASENAME']:
@@ -33,15 +39,6 @@ if CONFIG['MOZ_PHOENIX']:
 if CONFIG['MC_OFFICIAL']:
     DEFINES['MC_OFFICIAL'] = CONFIG['MC_OFFICIAL']
 
-if CONFIG['MC_BASILISK']:
-    DEFINES['MC_BASILISK'] = CONFIG['MC_BASILISK']
-
-if CONFIG['MC_PALEMOON']:
-    DEFINES['MC_PALEMOON'] = CONFIG['MC_PALEMOON']
-
-if CONFIG['BINOC_BOREALIS']:
-    DEFINES['BINOC_BOREALIS'] = CONFIG['BINOC_BOREALIS']
-
 if CONFIG['MOZ_APP_PROFILE']:
     DEFINES['MOZ_APP_PROFILE'] = CONFIG['MOZ_APP_PROFILE']
 
@@ -86,6 +83,7 @@ if CONFIG['MOZ_APP_BASENAME']:
         appini.script = 'appini_header.py'
         appini.inputs = ['!/dist/bin/application.ini']
 
+DEFINES['TOPSRCDIR'] = TOPSRCDIR
 DEFINES['TOPOBJDIR'] = TOPOBJDIR
 
 # NOTE: Keep .gdbinit in the topsrcdir for people who run gdb from the topsrcdir.
-- 
cgit v1.2.3