Update BUILD.gn for [P]NaCl.

BUILD.gn

 # Copyright 2014 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.
 
 import("//build/config/arm.gni")
 import("//build/config/android/config.gni")
 import("//build/config/chrome_build.gni")
 import("//third_party/libvpx/libvpx_srcs.gni")
 import("//third_party/yasm/yasm_assemble.gni")
 
-if (is_posix && !is_mac) {
-  os_category = "linux"
-} else {
-  os_category = current_os
-}
-
 # Sets the architecture name for building libvpx.
 if (current_cpu == "x86") {
   cpu_arch_full = "ia32"
 } else if (current_cpu == "x64") {
   if (is_msan) {
     cpu_arch_full = "generic"
   } else {
     cpu_arch_full = "x64"
   }
 } else if (current_cpu == "arm") {
   if (arm_use_neon) {
     cpu_arch_full = "arm-neon"
   } else if (is_android) {
     cpu_arch_full = "arm-neon-cpu-detect"
   } else {
     cpu_arch_full = "arm"
   }
 } else {
   cpu_arch_full = current_cpu
 }
 
+if (is_nacl) {
+  platform_include_dir = "//third_party/libvpx/source/config/nacl"
+} else {
+  if (is_posix && !is_mac) {
+    os_category = "linux"
+  } else {
+    os_category = current_os
+  }
+  platform_include_dir =
+      "//third_party/libvpx/source/config/$os_category/$cpu_arch_full"

[Johann, 2015/09/03 05:43:03]

ah, ok this moved so you have $cpu_arch_full defined.

[Sergey Ulanov, 2015/09/03 16:33:37]

GN doesn't allow to define variable and never use it. So it was complaining
about os_category being unused when compiling with is_nacl, that's why I had to
move here.

+}
+
 config("libvpx_config") {
   include_dirs = [
     "//third_party/libvpx/source/config",
-    "//third_party/libvpx/source/config/$os_category/$cpu_arch_full",
+    platform_include_dir,

[Johann, 2015/09/03 05:43:03]

$platform_include_dir?

[Sergey Ulanov, 2015/09/03 16:33:37]

this can be either platform_include_dir or "$platform_include_dir" (with
quotes). I don't see any reason to prefer the second variant.

[Johann, 2015/09/03 16:41:45]

Weird. OK!

     "//third_party/libvpx/source/libvpx",
     "$root_gen_dir/third_party/libvpx", # Provides vpx_rtcd.h.
   ]
 }
 
 # gn orders flags on a target before flags from configs. The default config
 # adds -Wall, and these flags have to be after -Wall -- so they need to come
 # from a config and can't be on the target directly.
 config("libvpx_warnings") {
   if (is_clang) {
@@ skipping 20 matching lines @@
 if (current_cpu == "x86" || current_cpu == "x64") {
   yasm_assemble("libvpx_yasm") {
     if (current_cpu == "x86") {
       sources = libvpx_srcs_x86_assembly
     } else if (current_cpu == "x64") {
       sources = libvpx_srcs_x86_64_assembly
     }
 
     defines = [ "CHROMIUM" ]
     include_dirs = [
-      "//third_party/libvpx/source/config/$os_category/$cpu_arch_full",
+      platform_include_dir,
       "//third_party/libvpx/source/config",
-     "//third_party/libvpx/source/libvpx",
+      "//third_party/libvpx/source/libvpx",
       target_gen_dir
     ]
   }
 }
 
 static_library("libvpx_intrinsics_mmx") {
   configs += [ ":libvpx_config" ]
   configs -= [ "//build/config/compiler:chromium_code" ]
   configs += [ "//build/config/compiler:no_chromium_code" ]
   configs += [ ":libvpx_warnings" ]
@@ skipping 114 matching lines @@
     ]
   }
 }
 
 static_library("libvpx") {
   if (!is_debug && is_win && is_official_build) {
     configs -= [ "//build/config/compiler:optimize" ]
     configs += [ "//build/config/compiler:optimize_max" ]
   }
 
-  if (current_cpu == "x86") {
+  if (is_nacl) {
+    sources = libvpx_srcs_generic
+  } else if (current_cpu == "x86") {
     sources = libvpx_srcs_x86
   } else if (current_cpu == "x64") {
     if (is_msan) {
       sources = libvpx_srcs_generic
     } else {
       sources = libvpx_srcs_x86_64
     }
   } else if (current_cpu == "mipsel") {
     sources = libvpx_srcs_mips
   } else if (current_cpu == "arm") {
@@ skipping 28 matching lines @@
   }
   if (is_android) {
     deps += [ "//third_party/android_tools:cpu_features" ]
   }
   if (current_cpu == "arm") {
     deps += [ ":libvpx_assembly_arm" ]
   }
 
   public_configs = [ ":libvpx_external_config" ]
 }