GN: Enable blink platform heap targets, put all tests behind flag

Source/platform/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/ui.gni")
 import("//third_party/WebKit/Source/build/scripts/scripts.gni")
 import("//third_party/WebKit/Source/config.gni")
 import("//third_party/WebKit/Source/platform/platform_generated.gni")
 
-# TODO(GYP) Remove when heap targets work
-enable_blink_platform_heap_targets = false
+# TODO(GYP) Remove when test targets link (depends on ffmpeg)
+enable_blink_platform_test_targets = false
 
 
-if (enable_blink_platform_heap_targets) {
 import("//third_party/yasm/yasm_assemble.gni")
-}
 
 platform_gypi = exec_script(
     "//build/gypi_to_gn.py",
     [ rebase_path("blink_platform.gypi") ],
     "scope",
     [ "blink_platform.gypi" ])
-
-if (enable_blink_platform_heap_targets) {
+if (enable_blink_platform_test_targets) {
 heap_gypi = exec_script(
     "//build/gypi_to_gn.py",
     [ rebase_path("heap/blink_heap.gypi") ],
     "scope",
     [ "heap/blink_heap.gypi" ])
 }
 
 blink_platform_neon_files = [
   "graphics/cpu/arm/WebGLImageConversionNEON.h",
   "graphics/cpu/arm/filters/FEBlendNEON.h",
@@ skipping 157 matching lines @@
     "BLINK_PLATFORM_IMPLEMENTATION=1",
     "INSIDE_BLINK",
   ]
 
   include_dirs = [
     #"$angle_path/include",
     "$root_gen_dir/blink",
   ]
 
   deps = [
+    ":heap_asm_stubs",
     ":make_platform_generated",
     "//gpu/command_buffer/client:gles2_c_lib",
     "//skia",
     "//third_party:jpeg",
     "//third_party/harfbuzz-ng",
     "//third_party/iccjpeg",
     "//third_party/icu",
     "//third_party/libpng",
     "//third_party/libwebp",
     "//third_party/ots",
     "//third_party/qcms",
     "//third_party/WebKit/Source/wtf",
     "//third_party/WebKit/Source/platform/heap",
     "//url",
     "//v8",
   ]
 
-  if (enable_blink_platform_heap_targets) {
-    deps += [ ":heap_asm_stubs" ]
-  }
-
   forward_dependent_configs_from = [
     "//gpu/command_buffer/client:gles2_c_lib",
     "//skia",
     "//third_party:jpeg",
     "//third_party/iccjpeg",
     "//third_party/libpng",
     "//third_party/libwebp",
     "//third_party/ots",
     "//third_party/qcms",
     "//url",
@@ skipping 108 matching lines @@
     #deps += [ "//third_party/ffmpeg" ]
   }
   if (use_openmax_dl_fft) {
     include_dirs += [ "//third_party/openmax_dl" ]
     # TODO(GYP)
     # deps += [ "//third_party/openmax_dl/dl" ]
   }
 }
 
 
-if (enable_blink_platform_heap_targets) {
-
 yasm_assemble("heap_asm_stubs") {
   if (cpu_arch == "x86" || cpu_arch == "x64") {
     sources = [ "heap/asm/SaveRegisters_x86.asm" ]
   } else if (cpu_arch == "arm") {
     sources = [ "heap/asm/SaveRegisters_arm.S" ]
   } else if (cpu_arch == "arm64") {
     sources = [ "heap/asm/SaveRegisters_arm64.S" ]
   } else if (cpu_arch == "mipsel") {
     sources = [ "heap/asm/SaveRegisters_mips.S" ]
   }
@@ skipping 10 matching lines @@
     } else {
       yasm_flags += [ "-DX64POSIX=1" ]
     }
   } else if (cpu_arch == "x86") {
     yasm_flags += [ "-DIA32=1" ]
   } else if (cpu_arch == "arm") {
     yasm_flags += [ "-DARM=1" ]
   }
 }
 
-}
-
 source_set("heap_run_all_tests") {
   sources = [
     "heap/RunAllTests.cpp"
   ]
 
   configs += [
     "//third_party/WebKit/Source/wtf:wtf_config",
     "//third_party/WebKit/Source:config",
     "//third_party/WebKit/Source:non_test_config",
   ]
 
   deps = [
     "//base/test:test_support",
     "//testing/gmock",
     "//testing/gtest",
     "//third_party/WebKit/Source/wtf",
   ]
 }
 
-if (enable_blink_platform_heap_targets) {
+if (enable_blink_platform_test_targets) {
 
 test("heap_unittests") {
   output_name = "blink_heap_unittests"
 
   sources = rebase_path(heap_gypi.platform_heap_test_files, ".", "heap")
 
   configs += [
     "//third_party/WebKit/Source:config",
   ]
 
@@ skipping 23 matching lines @@
   ]
 
   deps = [
     "//base/test:test_support",
     "//testing/gmock",
     "//testing/gtest",
     "//third_party/WebKit/Source/wtf",
   ]
 }
 
-# TODO(GYP) enable this target when it links (blocked on WebP symbols).
-if (false) {
+if (enable_blink_platform_test_targets) {
 
 test("platform_unittests") {
   output_name = "blink_platform_unittests"
 
   sources = platform_gypi.platform_test_files
 
   configs += [
     "//third_party/WebKit/Source:config",
   ]
 
   deps = [
     ":blink_common",
-    ":heap_run_all_tests",
+    ":platform_run_all_tests",
     ":platform",
     "//base",
     "//base/allocator",
     "//skia",
     "//testing/gmock",
     "//testing/gtest",
     "//third_party/WebKit/Source/wtf",
     "//third_party/WebKit/Source/wtf:unittest_helpers",
     "//url",
   ]
 
   defines = [
     "INSIDE_BLINK",
   ]
 
   include_dirs = [
-    "$root_gen_dir/blink/platform",
+    "$root_gen_dir/blink",
   ]
 }
 
-}  # TODO(GYP)
+}
 
 
 if (cpu_arch == "arm") {
   source_set("blink_arm_neon") {
     sources = blink_platform_neon_files
 
     # The *NEON.cpp files fail to compile when -mthumb is passed. Force
     # them to build in ARM mode.
     # See https://bugs.webkit.org/show_bug.cgi?id=62916.
     # TODO(GYP)
     #'cflags': ['-marm'],
     #    'conditions': [
     #      ['OS=="android"', {
     #        'cflags!': ['-mthumb'],
     #      }],
     #    ],
 
     deps = [ ":blink_common" ]
   }
 }