tree d11438c593a3af00f597eafa963cbf577a7c762e
parent cfaee3ce1b742a6858b6dc9bfd81eae7e17cf87c
parent 4213a472474053f456464b7d00d14adf814ecc44
author Andrew Woloszyn <awoloszyn@google.com> 1460766133 -0400
committer Andrew Woloszyn <awoloszyn@google.com> 1460766215 -0400

Merge remote-tracking branch 'aosp/upstream-master'

Pulls in the following:
4213a47 Fixed Android.mk for Windows.
c902a06 Enable test for failure of Vulkan shader targeting OpenGL
cdfb5ac Support Glslang with its new HLSL parser library
65d92e8 Test Vulkan-specific shaders
a18ea5b Enable dependency info dumping tests for abspath
aab7744 Remove revision from SPV_ENV_*.
d3bdf59 Add -I to the glslc synopsis.
afb959a Improve the #include behaviour description.
533ba9b Reflect ExtInstSet generation steps of SPIRV-Tools in Android.mk.
7c9ed1d Add new files appearing in SPIRV-Tools to Android.mk.
8468206 libspirv.h in SPIRV-Tools removed macros for version and revision.
9ede710 Add rules to build grammar tables in Android.mk for SPIRV-Tools.
e0d3d95 Enabled relative includes in glslc.
c15f6f3 Give spvContextCreate() a target environment.
d63c5e0 Update the interface to handle the new Glslang includer.

Change-Id: Id80cb4eb345ad51b4d4e1c80312f88063afb812c