Make content_shell link in the GN build.

It doesn't run yet. This disables WebRTC since that's not done yet.

Libvpx isn't done either. This patch exports the disable flag for this from media to dependent targets like the GYP build does. It adds one extra check for this flag in Pepper. I assume everybody that compiles without libvpx also disables plugins so this has never come up before.

Disable some warnings in Mesa.

The resulting binary does not yet run.

R=jamesr@chromium.org

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

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

1 files changed, 12 insertions, 2 deletions

diff --git a/build/secondary/third_party/icu/BUILD.gn b/build/secondary/third_party/icu/BUILD.gn
index e669587..14d59b5 100644
--- a/build/secondary/third_party/icu/BUILD.gn
+++ b/build/secondary/third_party/icu/BUILD.gn
@@ -5,7 +5,17 @@
 declare_args() {
   # Tells icu to load an external data file rather than rely on the icudata
   # being linked directly into the binary.
-  icu_use_data_file = false
+  #
+  # This flag is a bit confusing. As of this writing, icu.gyp set the value to
+  # 0 but common.gypi sets the value to 1 for most platforms (and the 1 takes
+  # precedence).
+  #
+  # TODO(GYP) We'll probably need to enhance this logic to set the value to
+  # true or false in similar circumstances. Note that in the GYP build, some
+  # other projects access this variable. If we need to do a similar thing,
+  # we should probably make an icu config file (//third_party/icu/config.gni)
+  # with this flag in it rather than making it global.
+  icu_use_data_file = true
 }
 
 # Meta target that includes both icuuc and icui18n. Most targets want both.
@@ -470,7 +480,7 @@ if (icu_use_data_file) {
   } else {
     copy("icudata") {
       if (is_android) {
-        sources = [ "android/icudt.dat" ]
+        sources = [ "android/icudtl.dat" ]
       } else {
         sources = [ "source/data/in/icudtl.dat" ]
       }