Merge remote-tracking branch 'origin/upstream' into tizen

Change-Id: I919d155e3bc4ba5e97d11ec9bb8732e0058b0d69
Signed-off-by: Joonbum Ko <joonbum.ko@samsung.com>

diff --cc .gitignore
Simple merge

diff --cc CMakeLists.txt
index 3a8a245,77d1d34..0e99e74
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -358,9 -380,12 +381,11 @@@ run_vk_xml_generate(helper_file_generat
  run_vk_xml_generate(helper_file_generator.py vk_object_types.h)
  run_vk_xml_generate(helper_file_generator.py vk_extension_helper.h)
  run_vk_xml_generate(helper_file_generator.py vk_typemap_helper.h)
- run_external_revision_generate(${EXTERNAL_SOURCE_ROOT}/glslang/External/spirv-tools SPIRV_TOOLS_COMMIT_ID spirv_tools_commit_id.h)
+ if(BUILD_LAYERS)
+     run_external_revision_generate(${EXTERNAL_SOURCE_ROOT}/glslang/External/spirv-tools SPIRV_TOOLS_COMMIT_ID spirv_tools_commit_id.h)
+ endif()
  
  
 -
  if(NOT WIN32)
      include(GNUInstallDirs)