The TODO timer has expired. Clean up old build TODOs and celebrate two weeks

of versioned directory awesomeness.
Review URL: http://codereview.chromium.org/334040

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30188 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 0 insertions, 26 deletions

diff --git a/chrome/tools/build/mac/clean_up_old_versions b/chrome/tools/build/mac/clean_up_old_versions
index b970a15..b5c6e5f 100755
--- a/chrome/tools/build/mac/clean_up_old_versions
+++ b/chrome/tools/build/mac/clean_up_old_versions
@@ -24,22 +24,3 @@ for dir in "${VERSIONED_DIR}/"* ; do
     rm -rf "${dir}"
   fi
 done
-
-# Older builds did not use a versioned directory, and instead placed the
-# framework, helper app, and other components directly within the main app
-# bundle.  To keep incremental developer builds relatively pristine and
-# equivalent to clean builds, these old components need to be cleaned up if
-# present.
-# Frameworks includes the app framework (Chromium Framework.framework or
-# Google Chrome Framework.framework) and, if Keystone-enabled,
-# KeystoneRegistration.framework.  To simplify this script, it removes the
-# helper app at its old location under either of the supported branding names.
-# TODO(mark): Remove the following section some time after October 27, 2009,
-# allowing two weeks for the transition.
-
-rm -rf "${CONTENTS_DIR}/Frameworks" \
-       "${CONTENTS_DIR}/Resources/Chromium Helper.app" \
-       "${CONTENTS_DIR}/Resources/Google Chrome Helper.app" \
-       "${CONTENTS_DIR}/MacOS/libavcodec.52.dylib" \
-       "${CONTENTS_DIR}/MacOS/libavformat.52.dylib" \
-       "${CONTENTS_DIR}/MacOS/libavutil.50.dylib"
diff --git a/chrome/tools/build/mac/copy_framework_unversioned b/chrome/tools/build/mac/copy_framework_unversioned
index f33a980..fc31ead 100755
--- a/chrome/tools/build/mac/copy_framework_unversioned
+++ b/chrome/tools/build/mac/copy_framework_unversioned
@@ -79,13 +79,6 @@ mkdir -p "${DESTINATION_DIR}"
 rsync -acC --delete --exclude Headers --exclude PrivateHeaders \
     "${CURRENT_VERSION}/" "${DESTINATION}"
 
-# The --exclude will prevent Headers and PrivateHeaders from showing up in
-# ${DESTINATION} in clobber builds, but if they are already present in older
-# builds, they will not be removed.  Remove them manually.
-# TODO(mark): Remove this after October 28, 2009, allowing two weeks for the
-# transition.
-rm -rf -- "${DESTINATION}/Headers" "${DESTINATION}/PrivateHeaders"
-
 # Adjust the Mach-O LC_ID_DYLIB load command in the framework.  This does not
 # change the LC_LOAD_DYLIB load commands in anything that may have already
 # linked against the framework.  Not all frameworks will actually need this