Rework build/mac/tweak_info_plist.py to not rely on environment variables.

Instead, pass the --plist to tweak on the command line. This way the
script can be used in both GYP and GN builds.

There is one behavior change: previously passing --keystone=1 would only
insert the Keystone keys if env['CONFIGURATION']=='Release' and after this
change, the keys will be added regardless of the build configuration if the
flag is passed.

BUG=297668

Review URL: https://codereview.chromium.org/1881053002

Cr-Commit-Position: refs/heads/master@{#386854}

build/mac/tweak_info_plist.py

@@ -22,7 +22,6 @@
 
 import optparse
 import os
-from os import environ as env
 import plistlib
 import re
 import subprocess
@@ -202,6 +201,8 @@ def _RemoveKeystoneKeys(plist):
 
 def Main(argv):
   parser = optparse.OptionParser('%prog [options]')
+  parser.add_option('--plist', dest='plist_path', action='store',
+      type='string', default=None, help='The path of the plist to tweak.')
   parser.add_option('--breakpad', dest='use_breakpad', action='store',
       type='int', default=False, help='Enable Breakpad [1 or 0]')
   parser.add_option('--breakpad_uploads', dest='breakpad_uploads',
@@ -224,9 +225,12 @@ def Main(argv):
     print >>sys.stderr, parser.get_usage()
     return 1
 
+  if not options.plist_path:
+    print >>sys.stderr, 'No --plist specified.'
+    return 1
+
   # Read the plist into its parsed format.
-  DEST_INFO_PLIST = os.path.join(env['TARGET_BUILD_DIR'], env['INFOPLIST_PATH'])
-  plist = plistlib.readPlist(DEST_INFO_PLIST)
+  plist = plistlib.readPlist(options.plist_path)
 
   # Insert the product version.
   if not _AddVersionKeys(plist, version=options.version):
@@ -251,8 +255,8 @@ def Main(argv):
   else:
     _RemoveBreakpadKeys(plist)
 
-  # Only add Keystone in Release builds.
-  if options.use_keystone and env['CONFIGURATION'] == 'Release':
+  # Add Keystone if configured to do so.
+  if options.use_keystone:
     if options.bundle_identifier is None:
       print >>sys.stderr, 'Use of Keystone requires the bundle id.'
       return 1
@@ -270,7 +274,8 @@ def Main(argv):
 
   # Info.plist will work perfectly well in any plist format, but traditionally
   # applications use xml1 for this, so convert it to ensure that it's valid.
-  proc = subprocess.Popen(['plutil', '-convert', 'xml1', '-o', DEST_INFO_PLIST,
+  proc = subprocess.Popen(['plutil', '-convert', 'xml1',
+                           '-o', options.plist_path,
                            temp_info_plist.name])
   proc.wait()
   return proc.returncode

chrome/app_shim/app_shim.gypi

@@ -74,6 +74,7 @@
           # never placed into the app mode loader.
           'postbuild_name': 'Tweak Info.plist',
           'action': ['<(tweak_info_plist_path)',
+                     '--plist=${TARGET_BUILD_DIR}/${INFOPLIST_PATH}',
                      '--breakpad=0',
                      '--keystone=0',
                      '--scm=0'],

chrome/chrome.gyp

@@ -228,6 +228,7 @@
               # never placed into the helper.
               'postbuild_name': 'Tweak Info.plist',
               'action': ['<(tweak_info_plist_path)',
+                         '--plist=${TARGET_BUILD_DIR}/${INFOPLIST_PATH}',
                          '--breakpad=0',
                          '--keystone=0',
                          '--scm=0'],

chrome/chrome_dll_bundle.gypi

@@ -114,6 +114,7 @@
       # but this seems like a really good place to store them.
       'postbuild_name': 'Tweak Info.plist',
       'action': ['<(tweak_info_plist_path)',
+                 '--plist=${TARGET_BUILD_DIR}/${INFOPLIST_PATH}',
                  '--breakpad=<(mac_breakpad_compiled_in)',
                  '--breakpad_uploads=<(mac_breakpad_uploads)',
                  '--keystone=0',

chrome/chrome_exe.gypi

@@ -341,6 +341,7 @@
               # include SCM information.
               'postbuild_name': 'Tweak Info.plist',
               'action': ['<(tweak_info_plist_path)',
+                         '--plist=${TARGET_BUILD_DIR}/${INFOPLIST_PATH}',
                          '--breakpad=0',
                          '--keystone=<(mac_keystone)',
                          '--scm=1',

content/content_shell.gypi

@@ -524,6 +524,7 @@
               # Modify the Info.plist as needed.
               'postbuild_name': 'Tweak Info.plist',
               'action': ['../build/mac/tweak_info_plist.py',
+                         '--plist=${TARGET_BUILD_DIR}/${INFOPLIST_PATH}',
                          '--scm=1',
                          '--version=<(content_shell_version)'],
             },
@@ -619,6 +620,7 @@
               # but this seems like a really good place to store them.
               'postbuild_name': 'Tweak Info.plist',
               'action': ['../build/mac/tweak_info_plist.py',
+                         '--plist=${TARGET_BUILD_DIR}/${INFOPLIST_PATH}',
                          '--breakpad=1',
                          '--keystone=0',
                          '--scm=1',
@@ -709,6 +711,7 @@
               # never placed into the helper.
               'postbuild_name': 'Tweak Info.plist',
               'action': ['../build/mac/tweak_info_plist.py',
+                         '--plist=${TARGET_BUILD_DIR}/${INFOPLIST_PATH}',
                          '--breakpad=0',
                          '--keystone=0',
                          '--scm=0',

extensions/shell/app_shell.gyp

@@ -172,6 +172,7 @@
               # Modify the Info.plist as needed.
               'postbuild_name': 'Tweak Info.plist',
               'action': ['../../build/mac/tweak_info_plist.py',
+                         '--plist=${TARGET_BUILD_DIR}/${INFOPLIST_PATH}',
                          '--scm=1',
                          '--version=<(app_shell_version)'],
             },
@@ -307,6 +308,7 @@
               # but this seems like a really good place to store them.
               'postbuild_name': 'Tweak Info.plist',
               'action': ['../../build/mac/tweak_info_plist.py',
+                         '--plist=${TARGET_BUILD_DIR}/${INFOPLIST_PATH}',
                          '--breakpad=1',
                          '--keystone=0',
                          '--scm=1',
@@ -379,6 +381,7 @@
               # never placed into the helper.
               'postbuild_name': 'Tweak Info.plist',
               'action': ['../../build/mac/tweak_info_plist.py',
+                         '--plist=${TARGET_BUILD_DIR}/${INFOPLIST_PATH}',
                          '--breakpad=0',
                          '--keystone=0',
                          '--scm=0',