Fix support for internal_gles2_conform_test = true

gpu/gles2_conform_support/BUILD.gn

 # Copyright 2015 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.
 
 declare_args() {
   # Set to true to compile with the OpenGL ES 2.0 conformance tests.
   internal_gles2_conform_tests = false
 }
 
 import("//build/config/allocator.gni")
@@ skipping 28 matching lines @@
   }
   if (use_allocator != "none") {
     # See http://crbug.com/162998#c4 for why this is needed.
     deps += [ "//base/allocator" ]
   }
 }
 
 if (internal_gles2_conform_tests) {
   action("generate_gles2_conform_embedded_data") {
     script = "generate_gles2_embedded_data.py"
-    output = [
-      "$target_gen_dir/gles2_conform_test_embedded_data/FilesData.c",
-      "$target_gen_dir/gles2_conform_test_embedded_data/FilesData.h",
+    outputs = [
+      "$target_gen_dir/gles2_conform_test_embedded_data/FilesDATA.c",
+      "$target_gen_dir/gles2_conform_test_embedded_data/FilesDATA.h",
       "$target_gen_dir/gles2_conform_test_embedded_data/FilesTOC.c",
     ]
     args = [
       "../../third_party/gles2_conform/GTF_ES/glsl/GTF",
       "$target_gen_dir/gles2_conform_test_embedded_data",
     ]
   }
-  gles2_conform_gypi = exec_script("//build/gypi_to_gn.py",
-                                   [ rebase_path("gles2_conform_gypi") ],
-                                   "scoped",
-                                   [ "gles2_conform_gypi" ])
+  gles2_conform_gypi =
+      exec_script("//build/gypi_to_gn.py",
+                  [
+                    rebase_path("gles2_conform.gypi"),
+                    "--replace=<(DEPTH)=../..",
+                    "--replace=<(SHARED_INTERMEDIATE_DIR)=$target_gen_dir",
+                  ],
+                  "scope",
+                  [ "gles2_conform.gypi" ])
   executable("gles2_conform_test_windowless") {
     testonly = true
-    sources = [
-      # Include a dummy c++ file to force linking of libstdc++.
-      "dummy.cc",
-      gles2_conform_gypi.gtf_es_sources,
-    ]
+
+    # Include a dummy c++ file to force linking of libstdc++.
+    sources = [ "dummy.cc" ] + gles2_conform_gypi.gtf_es_sources
     defines = [
       "GTF_API=GTF_GLES20",
       "HKEMBEDDEDFILESYSTEM",
     ]
     deps = [
       ":generate_gles2_conform_embedded_data",
       "//gpu/gles2_conform_support/egl",
       "//gpu/gles2_conform_support/native:windowless",
-      "//gpu/command_buffer/client:gles2_c_libnocheck",
+
+      #"//gpu/command_buffer/client:gles2_c_libnocheck",

[piman, 2015/09/03 20:28:02]

Should this be removed?

[Peter Mayo, 2015/09/03 21:13:35]

Was already done ahead of my last sync - rebase caught it.

     ]
-    configs += [ "//build/compiler:no_incompatible_pointer_warnings" ]
+    configs += [ "//build/config/compiler:no_incompatible_pointer_warnings" ]
     if (is_linux) {
       if (!is_chromeos) {
-        deps += [ "//build/linux/system/gtk" ]
+        deps += [ "//build/config/linux/gtk" ]

[Dirk Pranke, 2015/09/03 20:28:47]

the old thing didn't exist, but I don't think //build/config/linux/gtk exists,
either. I think you need either gtk2 or gtk3 ?

[Peter Mayo, 2015/09/03 21:13:35]

head moved to gtk2, rebased accordingly.

 
         if (is_clang) {
           cflags = [
             "-Wno-array-bounds",
             "-Wno-implicit-function-declaration",
             "-Wno-parentheses-equality",
             "-Wno-pointer-sign",
             "-Wno-return-type",
             "-Wno-sizeof-pointer-memaccess",
             "-Wno-tautological-compare",
@@ skipping 81 matching lines @@
     "//base",
     "//gpu/config",
     "//testing/gtest",
   ]
 
   data = [
     "gles2_conform_test_expectations.txt",
   ]
 
   if (internal_gles2_conform_tests) {
-    deps += [ "gles2_conform_test_windowless" ]
-
-    data_deps = [ "//third_party/gles2_conform/GTF_ES/" ]
+    deps += [ ":gles2_conform_test_windowless" ]
+    #data_deps = [ "//third_party/gles2_conform/GTF_ES/" ]

[piman, 2015/09/03 20:28:02]

Should this be removed?

[Peter Mayo, 2015/09/03 21:13:35]

I don't know why it was there in the first place.  Is there set of test data
still to migrate here, or is it really no longer required?  Dirk?

   }
 }