Fixup chromium specific bits after merge.

chromium/scripts/generate_gyp.py

 #!/usr/bin/python
 #
 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Creates a GYP include file for building FFmpeg from source.
 
 The way this works is a bit silly but it's easier than reverse engineering
 FFmpeg's configure scripts and Makefiles. It scans through build directories for
@@ skipping 15 matching lines @@
   cd deps
   git clone http://git.chromium.org/chromium/third_party/ffmpeg.git
 
 Step 3: Build for ia32/x64 platforms outside chroot (will need yasm in path)
   cd path/to/chromeos/deps/ffmpeg
   ./chromium/scripts/build_ffmpeg.sh linux ia32 path/to/chromeos/deps
   ./chromium/scripts/build_ffmpeg.sh linux x64 path/to/chromeos/deps
 
 Step 4: Build and enter Chromium OS chroot:
   cd path/to/chromeos/src/scripts
-  ./make_chroot
-  ./enter_chroot.sh
+  cros_sdk --enter
 
 Step 5: Setup build environment for ARM:
   ./setup_board --board arm-generic
 
 Step 6: Build for arm/arm-neon platforms inside chroot
-  ./build_ffmpeg.sh linux arm path/to/chromeos/deps
-  ./build_ffmpeg.sh linux arm-neon path/to/chromeos/deps
+  ./chromium/scripts/build_ffmpeg.sh linux arm path/to/chromeos/deps
+  ./chromium/scripts/build_ffmpeg.sh linux arm-neon path/to/chromeos/deps
 
 Step 7: Exit chroot and generate gyp file
   exit
   cd path/to/chromeos/deps/ffmpeg
   ./chromium/scripts/generate_gyp.py
 
 Phew!
 
 While this seems insane, reverse engineering and maintaining a gyp file by hand
 is significantly more painful.
@@ skipping 376 matching lines @@
 
   # Generate conditional stanza for each disjoint source set.
   for s in CreatePairwiseDisjointSets(sets):
     fd.write(s.GenerateGypStanza())
 
   fd.write(GYP_FOOTER)
   fd.close()
 
 if __name__ == '__main__':
   main()