Fixup chromium specific bits after merge.

chromium/scripts/copy_config.sh

Index: chromium/scripts/copy_config.sh
diff --git a/chromium/scripts/copy_config.sh b/chromium/scripts/copy_config.sh
index 76511facf0ed057436c07c65c7ae15708c060c98..44d9b6601e6e238217f928b07d95159463c15a9c 100755
--- a/chromium/scripts/copy_config.sh
+++ b/chromium/scripts/copy_config.sh
@@ -1,37 +1,29 @@
 #!/bin/bash -e
 
-# Copyright (c) 2011 The Chromium Authors. All rights reserved.
+# Copyright (c) 2012 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.
 
 # Use this to copy all config files into the tree.
+for os in linux mac win; do
+  for target in Chromium ChromiumOS Chrome ChromeOS; do
+    # Copy config files for various architectures:
+    #   - ia32/x64 have config.asm, config.h, codec_names.h
+    #   - arm/arm-neon have config.h, codec_names.h
+    for arch in arm arm-neon ia32 x64; do
+      # Don't waste time on non-existent configs, if no config.h then skip.
+      [ ! -e "build.$arch.$os/$target/config.h" ] && continue
 
-# Linux (all combinations).
-for target in Chromium ChromiumOS Chrome ChromeOS; do
-  # ia32/x64 have this funny little config.asm file!
-  for arch in ia32 x64; do
-    for f in config.h config.asm; do
-      FROM="build.$arch.linux/$target/$f"
-      TO="chromium/config/$target/linux/$arch/$f"
-      [ -e $FROM ] && cp -u -v $FROM $TO
-    done
-  done
-
-  # arm/arm-neon only have a config.h.
-  for arch in arm arm-neon; do
-    FROM="build.$arch.linux/$target/config.h"
-    TO="chromium/config/$target/linux/$arch/config.h"
-    [ -e $FROM ] && cp -u -v $FROM $TO
-  done
-done
+      for f in config.h config.asm; do
+        FROM="build.$arch.$os/$target/$f"
+        TO="chromium/config/$target/$os/$arch/$f"
+        [ -e $FROM ] && cp -v $FROM $TO
+      done
 
-# Mac/Windows (ia32).
-for os in mac win; do
-  for target in Chromium Chrome ; do
-    for f in config.h config.asm; do
-      FROM="build.ia32.$os/$target/$f"
-      TO="chromium/config/$target/$os/ia32/$f"
-      [ -e $FROM ] && cp -u -v $FROM $TO
+      mkdir -p "chromium/config/$target/$os/$arch/libavcodec/"
+      FROM="build.$arch.$os/$target/libavcodec/codec_names.h"
+      TO="chromium/config/$target/$os/$arch/libavcodec/codec_names.h"
+      [ -e $FROM ] && cp -v $FROM $TO
     done
   done
 done