Chromium roll (https://codereview.chromium.org/976353002)

third_party/mesa/BUILD.gn

Index: third_party/mesa/BUILD.gn
diff --git a/third_party/mesa/BUILD.gn b/third_party/mesa/BUILD.gn
index 468a7e612b92671cb349ad49ec1d890037d84468..acdca8616273962c6b81f55e89cd44e26f4465cd 100644
--- a/third_party/mesa/BUILD.gn
+++ b/third_party/mesa/BUILD.gn
@@ -149,19 +149,19 @@ static_library("mesa_libglslcommon") {
     "src/src/glsl/glsl_types.cpp",
     "src/src/glsl/glsl_types.h",
     "src/src/glsl/hir_field_selection.cpp",
+    "src/src/glsl/ir.cpp",
+    "src/src/glsl/ir.h",
     "src/src/glsl/ir_basic_block.cpp",
     "src/src/glsl/ir_basic_block.h",
     "src/src/glsl/ir_builder.cpp",
     "src/src/glsl/ir_builder.h",
     "src/src/glsl/ir_clone.cpp",
     "src/src/glsl/ir_constant_expression.cpp",
-    "src/src/glsl/ir.cpp",
     "src/src/glsl/ir_expression_flattening.cpp",
     "src/src/glsl/ir_expression_flattening.h",
-    "src/src/glsl/ir_function_can_inline.cpp",
     "src/src/glsl/ir_function.cpp",
+    "src/src/glsl/ir_function_can_inline.cpp",
     "src/src/glsl/ir_function_detect_recursion.cpp",
-    "src/src/glsl/ir.h",
     "src/src/glsl/ir_hierarchical_visitor.cpp",
     "src/src/glsl/ir_hierarchical_visitor.h",
     "src/src/glsl/ir_hv_accept.cpp",
@@ -176,11 +176,11 @@ static_library("mesa_libglslcommon") {
     "src/src/glsl/ir_validate.cpp",
     "src/src/glsl/ir_variable_refcount.cpp",
     "src/src/glsl/ir_variable_refcount.h",
-    "src/src/glsl/linker.cpp",
-    "src/src/glsl/linker.h",
     "src/src/glsl/link_functions.cpp",
     "src/src/glsl/link_uniform_initializers.cpp",
     "src/src/glsl/link_uniforms.cpp",
+    "src/src/glsl/linker.cpp",
+    "src/src/glsl/linker.h",
     "src/src/glsl/loop_analysis.cpp",
     "src/src/glsl/loop_analysis.h",
     "src/src/glsl/loop_controls.cpp",
@@ -250,7 +250,11 @@ static_library("mesa_libglslcommon") {
 static_library("mesa") {
   sources = [
     "$generated_src_dir/mesa/builtin_function.cpp",
+    "$generated_src_dir/mesa/enums.c",
     "$generated_src_dir/mesa/glapi_mapi_tmp_shared.h",
+    "$generated_src_dir/mesa/lex.yy.c",
+    "$generated_src_dir/mesa/program/program_parse.tab.c",
+    "$generated_src_dir/mesa/program/program_parse.tab.h",
     "src/src/mapi/mapi/entry.c",
     "src/src/mapi/mapi/entry.h",
     "src/src/mapi/mapi/mapi_glapi.c",
@@ -312,7 +316,6 @@ static_library("mesa") {
     "src/src/mesa/main/drawtex.h",
     "src/src/mesa/main/enable.c",
     "src/src/mesa/main/enable.h",
-    "$generated_src_dir/mesa/enums.c",
     "src/src/mesa/main/enums.h",
     "src/src/mesa/main/errors.c",
     "src/src/mesa/main/errors.h",
@@ -474,7 +477,6 @@ static_library("mesa") {
     "src/src/mesa/program/hash_table.h",
     "src/src/mesa/program/ir_to_mesa.cpp",
     "src/src/mesa/program/ir_to_mesa.h",
-    "$generated_src_dir/mesa/lex.yy.c",
     "src/src/mesa/program/nvfragparse.c",
     "src/src/mesa/program/nvfragparse.h",
     "src/src/mesa/program/nvvertparse.c",
@@ -500,8 +502,6 @@ static_library("mesa") {
     "src/src/mesa/program/prog_statevars.h",
     "src/src/mesa/program/program.c",
     "src/src/mesa/program/program.h",
-    "$generated_src_dir/mesa/program/program_parse.tab.c",
-    "$generated_src_dir/mesa/program/program_parse.tab.h",
     "src/src/mesa/program/program_parse_extra.c",
     "src/src/mesa/program/programopt.c",
     "src/src/mesa/program/programopt.h",