Added a script to remove headers from the target....

build/mac/tweak_app_infoplist

Index: build/mac/tweak_app_infoplist
===================================================================
--- build/mac/tweak_app_infoplist	(revision 16417)
+++ build/mac/tweak_app_infoplist	(working copy)
@@ -7,13 +7,17 @@
 set -e
 
 # Pull off the optional args
-INCLUDE_BREAKPAD=0
+USE_BREAKPAD=0
+USE_KS=0

[Mark Mentovai, 2009/05/20 18:43:13]

I would spell out KEYSTONE (like BREAKPAD).

 OPTERR=0
-while getopts ":b:" an_opt ; do
+while getopts ":b:k:" an_opt ; do
   case $an_opt in
     b)
-      INCLUDE_BREAKPAD=$OPTARG
+      USE_BREAKPAD=$OPTARG
       ;;
+    k)
+      USE_KS=$OPTARG
+      ;;
     \?)
       echo "Unknown option $OPTARG"
       exit 1
@@ -111,7 +115,7 @@
     NSHumanReadableCopyright -string "${COPYRIGHT_STRING}"
 
 # Add/Remove the breakpad keys
-if [ "${INCLUDE_BREAKPAD}" == "1" ] ; then
+if [ "${USE_BREAKPAD}" == "1" ] ; then

[Mark Mentovai, 2009/05/20 18:43:13]

Strictly speaking, test/[ uses = for string equality, not ==.

   defaults write "${TMP_INFO_PLIST_DEFAULTS}" \
       BreakpadURL "https://clients2.google.com/cr/report"
   defaults write "${TMP_INFO_PLIST_DEFAULTS}" BreakpadReportInterval "3600"
@@ -134,6 +138,21 @@
   defaults delete "${TMP_INFO_PLIST_DEFAULTS}" BreakpadSkipConfirm || true
 fi
 
+# Add/Remove keystone keys (only supported in release builds)
+if [ \( "${USE_KS}" == "1" \) -a \( "${CONFIGURATION}" == "Release" \) ] ; then

[Mark Mentovai, 2009/05/20 18:43:13]

-a is ass.  That's what it stands for, in fact.  You're better off with:

if [ "${USE_KS}" = "1" ] && [ "${CONFIGURATION}" = "Release" ] ; then

-a doesn't short-circuit and is pretty much obsolete.

+  KEYSTONE_URL="https://tools.google.com/service/update2"
+  KEYSTONE_APP_ID=$(defaults read "${TMP_INFO_PLIST_DEFAULTS}" \
+                                                            CFBundleIdentifier)
+  defaults write "${TMP_INFO_PLIST_DEFAULTS}" KSVersion -string "${FULL_VERSION}"

[Mark Mentovai, 2009/05/20 18:43:13]

80

+  defaults write "${TMP_INFO_PLIST_DEFAULTS}" KSProductID "${KEYSTONE_APP_ID}"
+  defaults write "${TMP_INFO_PLIST_DEFAULTS}" KSUpdateURL "${KEYSTONE_URL}"
+else
+  # Make sure the keys aren't there, || true to avoid errors if they aren't.
+  defaults delete "${TMP_INFO_PLIST_DEFAULTS}" KSVersion || true
+  defaults delete "${TMP_INFO_PLIST_DEFAULTS}" KSProductID || true
+  defaults delete "${TMP_INFO_PLIST_DEFAULTS}" KSUpdateURL || true
+fi
+
 # Info.plist will work perfectly well in any plist format, but traditionally
 # applications use xml1 for this, so convert it back after whatever defaults
 # might have done.