Merge from Chromium at DEPS revision 614f7b807940

This commit was generated by merge_to_master.py.

Change-Id: I89d093f14f8025ce1e505ce2a2755212c5c4fd2a

13 files changed, 58 insertions, 30 deletions

diff --git a/third_party/mesa/BUILD.gn b/third_party/mesa/BUILD.gn
index a883d418d9..9d339946a2 100644
--- a/third_party/mesa/BUILD.gn
+++ b/third_party/mesa/BUILD.gn
@@ -272,7 +272,6 @@ static_library("mesa") {
     "src/src/mesa/main/api_arrayelt.h",
     "src/src/mesa/main/api_exec.c",
     "src/src/mesa/main/api_exec.h",
-    "$generated_src_dir/mesa/api_exec_es1.c",
     "src/src/mesa/main/api_loopback.c",
     "src/src/mesa/main/api_loopback.h",
     "src/src/mesa/main/api_validate.c",
@@ -321,8 +320,6 @@ static_library("mesa") {
     "src/src/mesa/main/enums.h",
     "src/src/mesa/main/errors.c",
     "src/src/mesa/main/errors.h",
-    "src/src/mesa/main/es1_conversion.c",
-    "src/src/mesa/main/es1_conversion.h",
     "src/src/mesa/main/eval.c",
     "src/src/mesa/main/eval.h",
     "src/src/mesa/main/execmem.c",
@@ -388,7 +385,6 @@ static_library("mesa") {
     "src/src/mesa/main/points.h",
     "src/src/mesa/main/polygon.c",
     "src/src/mesa/main/polygon.h",
-    "src/src/mesa/main/querymatrix.c",
     "src/src/mesa/main/queryobj.c",
     "src/src/mesa/main/queryobj.h",
     "src/src/mesa/main/rastpos.c",
diff --git a/third_party/mesa/mesa.gyp b/third_party/mesa/mesa.gyp
index be008d4c15..6ccbb2ac4b 100644
--- a/third_party/mesa/mesa.gyp
+++ b/third_party/mesa/mesa.gyp
@@ -298,7 +298,6 @@
         'src/src/mesa/main/api_arrayelt.h',
         'src/src/mesa/main/api_exec.c',
         'src/src/mesa/main/api_exec.h',
-        '<(generated_src_dir)/mesa/api_exec_es1.c',
         'src/src/mesa/main/api_loopback.c',
         'src/src/mesa/main/api_loopback.h',
         'src/src/mesa/main/api_validate.c',
@@ -347,8 +346,6 @@
         'src/src/mesa/main/enums.h',
         'src/src/mesa/main/errors.c',
         'src/src/mesa/main/errors.h',
-        'src/src/mesa/main/es1_conversion.c',
-        'src/src/mesa/main/es1_conversion.h',
         'src/src/mesa/main/eval.c',
         'src/src/mesa/main/eval.h',
         'src/src/mesa/main/execmem.c',
@@ -414,7 +411,6 @@
         'src/src/mesa/main/points.h',
         'src/src/mesa/main/polygon.c',
         'src/src/mesa/main/polygon.h',
-        'src/src/mesa/main/querymatrix.c',
         'src/src/mesa/main/queryobj.c',
         'src/src/mesa/main/queryobj.h',
         'src/src/mesa/main/rastpos.c',
@@ -661,6 +657,14 @@
             '_GLAPI_NO_EXPORTS',
           ],
         }],
+        ['ubsan==1', {
+          # Due to a bug in LLVM (http://llvm.org/bugs/show_bug.cgi?id=21349),
+          # compilation hangs for some Mesa source files. Disable -O2
+          # temporarily until http://crbug.com/426271 is fixed.
+          'cflags!': [
+            '-O2',
+          ],
+        }],
       ],
     },
     # Building this target will hide the native OpenGL shared library and
diff --git a/third_party/mesa/mesa_gensrc.gypi b/third_party/mesa/mesa_gensrc.gypi
index 8b4b225a4c..f35c23e003 100644
--- a/third_party/mesa/mesa_gensrc.gypi
+++ b/third_party/mesa/mesa_gensrc.gypi
@@ -585,28 +585,6 @@
           'message': "Generating indirect_size.c ...",
         },
         {
-          'action_name': 'api_exec_es1_c',
-          'inputs': [
-            '<@(xmlfiles)',
-            'redirectoutput.py',
-            'src/src/mesa/main/es_generator.py',
-          ],
-          'outputs': [
-            '<(generated_src_dir)/mesa/api_exec_es1.c',
-          ],
-          'action': [
-            'python',
-            'redirectoutput.py',
-            '<(generated_src_dir)/mesa/api_exec_es1.c',
-            'src/src/mesa/main/es_generator.py',
-            '-S',
-            'src/src/mesa/main/APIspec.xml',
-            '-V',
-            'GLES1.1',
-          ],
-          'message': "Generating api_exec_es1.c ...",
-        },
-        {
           'action_name': 'git_sha1_h',
           'inputs': [
           ],
diff --git a/third_party/mesa/mesa_headers.target.darwin-arm.mk b/third_party/mesa/mesa_headers.target.darwin-arm.mk
index 9697a13c61..74167e031e 100644
--- a/third_party/mesa/mesa_headers.target.darwin-arm.mk
+++ b/third_party/mesa/mesa_headers.target.darwin-arm.mk
@@ -7,6 +7,7 @@ LOCAL_MODULE := third_party_mesa_mesa_headers_gyp
 LOCAL_MODULE_STEM := mesa_headers
 LOCAL_MODULE_SUFFIX := .stamp
 LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH)
+LOCAL_SDK_VERSION := 21
 gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX))
 gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX))
 
@@ -19,6 +20,10 @@ GYP_GENERATED_OUTPUTS :=
 LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
 
 ### Rules for final target.
+### Set directly by aosp_build_settings.
+LOCAL_CLANG := false
+LOCAL_NDK_STL_VARIANT := stlport_static
+
 # Add target alias to "gyp_all_modules" target.
 .PHONY: gyp_all_modules
 gyp_all_modules: third_party_mesa_mesa_headers_gyp
diff --git a/third_party/mesa/mesa_headers.target.darwin-arm64.mk b/third_party/mesa/mesa_headers.target.darwin-arm64.mk
index 9697a13c61..74167e031e 100644
--- a/third_party/mesa/mesa_headers.target.darwin-arm64.mk
+++ b/third_party/mesa/mesa_headers.target.darwin-arm64.mk
@@ -7,6 +7,7 @@ LOCAL_MODULE := third_party_mesa_mesa_headers_gyp
 LOCAL_MODULE_STEM := mesa_headers
 LOCAL_MODULE_SUFFIX := .stamp
 LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH)
+LOCAL_SDK_VERSION := 21
 gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX))
 gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX))
 
@@ -19,6 +20,10 @@ GYP_GENERATED_OUTPUTS :=
 LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
 
 ### Rules for final target.
+### Set directly by aosp_build_settings.
+LOCAL_CLANG := false
+LOCAL_NDK_STL_VARIANT := stlport_static
+
 # Add target alias to "gyp_all_modules" target.
 .PHONY: gyp_all_modules
 gyp_all_modules: third_party_mesa_mesa_headers_gyp
diff --git a/third_party/mesa/mesa_headers.target.darwin-mips.mk b/third_party/mesa/mesa_headers.target.darwin-mips.mk
index 9697a13c61..74167e031e 100644
--- a/third_party/mesa/mesa_headers.target.darwin-mips.mk
+++ b/third_party/mesa/mesa_headers.target.darwin-mips.mk
@@ -7,6 +7,7 @@ LOCAL_MODULE := third_party_mesa_mesa_headers_gyp
 LOCAL_MODULE_STEM := mesa_headers
 LOCAL_MODULE_SUFFIX := .stamp
 LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH)
+LOCAL_SDK_VERSION := 21
 gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX))
 gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX))
 
@@ -19,6 +20,10 @@ GYP_GENERATED_OUTPUTS :=
 LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
 
 ### Rules for final target.
+### Set directly by aosp_build_settings.
+LOCAL_CLANG := false
+LOCAL_NDK_STL_VARIANT := stlport_static
+
 # Add target alias to "gyp_all_modules" target.
 .PHONY: gyp_all_modules
 gyp_all_modules: third_party_mesa_mesa_headers_gyp
diff --git a/third_party/mesa/mesa_headers.target.darwin-x86.mk b/third_party/mesa/mesa_headers.target.darwin-x86.mk
index 9697a13c61..74167e031e 100644
--- a/third_party/mesa/mesa_headers.target.darwin-x86.mk
+++ b/third_party/mesa/mesa_headers.target.darwin-x86.mk
@@ -7,6 +7,7 @@ LOCAL_MODULE := third_party_mesa_mesa_headers_gyp
 LOCAL_MODULE_STEM := mesa_headers
 LOCAL_MODULE_SUFFIX := .stamp
 LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH)
+LOCAL_SDK_VERSION := 21
 gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX))
 gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX))
 
@@ -19,6 +20,10 @@ GYP_GENERATED_OUTPUTS :=
 LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
 
 ### Rules for final target.
+### Set directly by aosp_build_settings.
+LOCAL_CLANG := false
+LOCAL_NDK_STL_VARIANT := stlport_static
+
 # Add target alias to "gyp_all_modules" target.
 .PHONY: gyp_all_modules
 gyp_all_modules: third_party_mesa_mesa_headers_gyp
diff --git a/third_party/mesa/mesa_headers.target.darwin-x86_64.mk b/third_party/mesa/mesa_headers.target.darwin-x86_64.mk
index 9697a13c61..74167e031e 100644
--- a/third_party/mesa/mesa_headers.target.darwin-x86_64.mk
+++ b/third_party/mesa/mesa_headers.target.darwin-x86_64.mk
@@ -7,6 +7,7 @@ LOCAL_MODULE := third_party_mesa_mesa_headers_gyp
 LOCAL_MODULE_STEM := mesa_headers
 LOCAL_MODULE_SUFFIX := .stamp
 LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH)
+LOCAL_SDK_VERSION := 21
 gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX))
 gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX))
 
@@ -19,6 +20,10 @@ GYP_GENERATED_OUTPUTS :=
 LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
 
 ### Rules for final target.
+### Set directly by aosp_build_settings.
+LOCAL_CLANG := false
+LOCAL_NDK_STL_VARIANT := stlport_static
+
 # Add target alias to "gyp_all_modules" target.
 .PHONY: gyp_all_modules
 gyp_all_modules: third_party_mesa_mesa_headers_gyp
diff --git a/third_party/mesa/mesa_headers.target.linux-arm.mk b/third_party/mesa/mesa_headers.target.linux-arm.mk
index 9697a13c61..74167e031e 100644
--- a/third_party/mesa/mesa_headers.target.linux-arm.mk
+++ b/third_party/mesa/mesa_headers.target.linux-arm.mk
@@ -7,6 +7,7 @@ LOCAL_MODULE := third_party_mesa_mesa_headers_gyp
 LOCAL_MODULE_STEM := mesa_headers
 LOCAL_MODULE_SUFFIX := .stamp
 LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH)
+LOCAL_SDK_VERSION := 21
 gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX))
 gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX))
 
@@ -19,6 +20,10 @@ GYP_GENERATED_OUTPUTS :=
 LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
 
 ### Rules for final target.
+### Set directly by aosp_build_settings.
+LOCAL_CLANG := false
+LOCAL_NDK_STL_VARIANT := stlport_static
+
 # Add target alias to "gyp_all_modules" target.
 .PHONY: gyp_all_modules
 gyp_all_modules: third_party_mesa_mesa_headers_gyp
diff --git a/third_party/mesa/mesa_headers.target.linux-arm64.mk b/third_party/mesa/mesa_headers.target.linux-arm64.mk
index 9697a13c61..74167e031e 100644
--- a/third_party/mesa/mesa_headers.target.linux-arm64.mk
+++ b/third_party/mesa/mesa_headers.target.linux-arm64.mk
@@ -7,6 +7,7 @@ LOCAL_MODULE := third_party_mesa_mesa_headers_gyp
 LOCAL_MODULE_STEM := mesa_headers
 LOCAL_MODULE_SUFFIX := .stamp
 LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH)
+LOCAL_SDK_VERSION := 21
 gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX))
 gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX))
 
@@ -19,6 +20,10 @@ GYP_GENERATED_OUTPUTS :=
 LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
 
 ### Rules for final target.
+### Set directly by aosp_build_settings.
+LOCAL_CLANG := false
+LOCAL_NDK_STL_VARIANT := stlport_static
+
 # Add target alias to "gyp_all_modules" target.
 .PHONY: gyp_all_modules
 gyp_all_modules: third_party_mesa_mesa_headers_gyp
diff --git a/third_party/mesa/mesa_headers.target.linux-mips.mk b/third_party/mesa/mesa_headers.target.linux-mips.mk
index 9697a13c61..74167e031e 100644
--- a/third_party/mesa/mesa_headers.target.linux-mips.mk
+++ b/third_party/mesa/mesa_headers.target.linux-mips.mk
@@ -7,6 +7,7 @@ LOCAL_MODULE := third_party_mesa_mesa_headers_gyp
 LOCAL_MODULE_STEM := mesa_headers
 LOCAL_MODULE_SUFFIX := .stamp
 LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH)
+LOCAL_SDK_VERSION := 21
 gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX))
 gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX))
 
@@ -19,6 +20,10 @@ GYP_GENERATED_OUTPUTS :=
 LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
 
 ### Rules for final target.
+### Set directly by aosp_build_settings.
+LOCAL_CLANG := false
+LOCAL_NDK_STL_VARIANT := stlport_static
+
 # Add target alias to "gyp_all_modules" target.
 .PHONY: gyp_all_modules
 gyp_all_modules: third_party_mesa_mesa_headers_gyp
diff --git a/third_party/mesa/mesa_headers.target.linux-x86.mk b/third_party/mesa/mesa_headers.target.linux-x86.mk
index 9697a13c61..74167e031e 100644
--- a/third_party/mesa/mesa_headers.target.linux-x86.mk
+++ b/third_party/mesa/mesa_headers.target.linux-x86.mk
@@ -7,6 +7,7 @@ LOCAL_MODULE := third_party_mesa_mesa_headers_gyp
 LOCAL_MODULE_STEM := mesa_headers
 LOCAL_MODULE_SUFFIX := .stamp
 LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH)
+LOCAL_SDK_VERSION := 21
 gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX))
 gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX))
 
@@ -19,6 +20,10 @@ GYP_GENERATED_OUTPUTS :=
 LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
 
 ### Rules for final target.
+### Set directly by aosp_build_settings.
+LOCAL_CLANG := false
+LOCAL_NDK_STL_VARIANT := stlport_static
+
 # Add target alias to "gyp_all_modules" target.
 .PHONY: gyp_all_modules
 gyp_all_modules: third_party_mesa_mesa_headers_gyp
diff --git a/third_party/mesa/mesa_headers.target.linux-x86_64.mk b/third_party/mesa/mesa_headers.target.linux-x86_64.mk
index 9697a13c61..74167e031e 100644
--- a/third_party/mesa/mesa_headers.target.linux-x86_64.mk
+++ b/third_party/mesa/mesa_headers.target.linux-x86_64.mk
@@ -7,6 +7,7 @@ LOCAL_MODULE := third_party_mesa_mesa_headers_gyp
 LOCAL_MODULE_STEM := mesa_headers
 LOCAL_MODULE_SUFFIX := .stamp
 LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH)
+LOCAL_SDK_VERSION := 21
 gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX))
 gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX))
 
@@ -19,6 +20,10 @@ GYP_GENERATED_OUTPUTS :=
 LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
 
 ### Rules for final target.
+### Set directly by aosp_build_settings.
+LOCAL_CLANG := false
+LOCAL_NDK_STL_VARIANT := stlport_static
+
 # Add target alias to "gyp_all_modules" target.
 .PHONY: gyp_all_modules
 gyp_all_modules: third_party_mesa_mesa_headers_gyp