diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4d27165..8c68435 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -118,6 +118,7 @@
 option_if_not_defined(SWIFTSHADER_BUILD_WSI_WAYLAND "Build the Wayland WSI support" FALSE)
 option_if_not_defined(SWIFTSHADER_BUILD_PVR "Build the PowerVR examples" TRUE)
 option_if_not_defined(SWIFTSHADER_GET_PVR "Check out the PowerVR submodule" FALSE)
+option_if_not_defined(SWIFTSHADER_BUILD_ANGLE "Build angle" FALSE)
 
 option_if_not_defined(SWIFTSHADER_USE_GROUP_SOURCES "Group the source files in a folder tree for Visual Studio" TRUE)
 
@@ -227,6 +228,9 @@
     InitSubmodule(cppdap ${THIRD_PARTY_DIR}/cppdap)
 endif()
 
+if(SWIFTSHADER_BUILD_ANGLE)
+    InitSubmodule(angle ${THIRD_PARTY_DIR}/angle/angle)
+endif()
 
 ###########################################################
 # Convenience macros
@@ -740,6 +744,16 @@
 
 endif()
 
+if(SWIFTSHADER_BUILD_ANGLE)
+    add_subdirectory(${THIRD_PARTY_DIR}/angle)
+
+    # Make angle depend on vk_swiftshader so we can test SWANGLE
+    if (TARGET vk_swiftshader)
+        add_dependencies(angle vk_swiftshader)
+    endif()
+endif()
+
+
 ###########################################################
 # Sample programs and tests
 ###########################################################
@@ -867,6 +881,13 @@
     foreach(pvr_target ${PVR_TARGET_OTHER} ${PVR_VULKAN_TARGET_OTHER} ${PVR_GLES_TARGET_OTHER})
         set_target_properties(${pvr_target} PROPERTIES FOLDER Samples/PowerVR-Build)
     endforeach()
+
+    # Make angle target depend on PowerVR GL examples
+    if (TARGET angle)
+        foreach(pvr_target ${PVR_GLES_TARGET})
+            add_dependencies(angle ${pvr_target})
+        endforeach()
+    endif()
 endif()
 
 if(SWIFTSHADER_BUILD_TESTS)
diff --git a/third_party/angle/CMakeLists.txt b/third_party/angle/CMakeLists.txt
new file mode 100644
index 0000000..cd6b306
--- /dev/null
+++ b/third_party/angle/CMakeLists.txt
@@ -0,0 +1,108 @@
+# Copyright 2020 The SwiftShader Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+# angle setup
+
+find_package(Python2 COMPONENTS Interpreter REQUIRED)
+
+# Depend on .gclient file. Setup only runs if this file doesn't exist in the angle
+# submodule checkout.
+set(ANGLE_SETUP_OUTPUT
+    "${CMAKE_CURRENT_SOURCE_DIR}/angle/.gclient"
+)
+
+add_custom_command(
+    COMMENT "Setting up angle"
+    OUTPUT ${ANGLE_SETUP_OUTPUT}
+    VERBATIM
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/angle
+
+    COMMAND ${Python2_EXECUTABLE} scripts/bootstrap.py
+    COMMAND gclient sync
+
+    # On Linux, run install deps script
+    COMMAND "$<IF:$<BOOL:1>,build/install-build-deps.sh,echo>"
+)
+add_custom_target(angle-setup DEPENDS
+    ${ANGLE_SETUP_OUTPUT}
+)
+set_target_properties(angle-setup PROPERTIES FOLDER ANGLE)
+
+
+# angle build
+
+# Depend on all angle source files, even though most of these aren't used to build
+# the ouput files we want. Ninja will run very quickly anyway, and the output files
+# are always touched to make sure subsequent builds do nothing.
+file(GLOB_RECURSE ANGLE_SRC_FILES
+    CONFIGURE_DEPENDS angle/src/*.cpp
+)
+
+set(ANGLE_BUILD_OUTPUT
+  "${CMAKE_BINARY_DIR}/bin-angle/libEGL${CMAKE_SHARED_LIBRARY_SUFFIX}"
+  "${CMAKE_BINARY_DIR}/bin-angle/libGLESv2${CMAKE_SHARED_LIBRARY_SUFFIX}"
+)
+
+# The root CMakeLists adds a dependency from angle onto the PowerVR GL example
+# targets. For angle, we copy the PVR output 'bin' folder to 'bin-angle' into
+# which we build the angle targets we want.
+set(PVR_OUTPUT_DIR "${CMAKE_BINARY_DIR}/bin")
+set(ANGLE_OUTPUT_DIR "${CMAKE_BINARY_DIR}/bin-angle")
+
+# For some reason, "gn gen" returns a non-zero code on Windows, despite completing correctly,
+# which makes the custom_command below not complete. For now, we work around this by wrapping
+# up the call in a generated batch script.
+if(WIN32)
+    file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/run_gn.bat "gn %*")
+    set(GN_COMMAND ${CMAKE_CURRENT_BINARY_DIR}/run_gn.bat)
+else()
+    set(GN_COMMAND "gn")
+endif()
+
+add_custom_command(
+    COMMENT "Building angle"
+    OUTPUT ${ANGLE_BUILD_OUTPUT}
+    DEPENDS ${ANGLE_SRC_FILES}
+    VERBATIM
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/angle
+
+    # Copy PowerVR's bin directory to bin-angle. Always create the bin folder in case PowerVR isn't being built.
+    COMMAND ${CMAKE_COMMAND} -E make_directory ${PVR_OUTPUT_DIR}
+    COMMAND ${CMAKE_COMMAND} -E copy_directory ${PVR_OUTPUT_DIR} ${ANGLE_OUTPUT_DIR}
+    # Delete the output files that may have been copied over. These are the SwiftShader versions, and we want the ANGLE ones.
+    COMMAND ${CMAKE_COMMAND} -E remove -f ${ANGLE_BUILD_OUTPUT}
+
+    # gn build angle targets we want
+    COMMAND ${GN_COMMAND} gen ${ANGLE_OUTPUT_DIR}
+    COMMAND autoninja -C ${ANGLE_OUTPUT_DIR} libEGL libGLESv2
+
+    # Always update time stamps of output files since dependencies of this command (${ANGLE_SRC_FILES})
+    # include files that aren't actually used to build the output files.
+    COMMAND ${CMAKE_COMMAND} -E touch_nocreate ${ANGLE_BUILD_OUTPUT}
+)
+add_custom_target(angle ALL DEPENDS
+    angle-setup
+    ${ANGLE_BUILD_OUTPUT}
+)
+set_target_properties(angle PROPERTIES FOLDER ANGLE)
+
+# Copy script to setup swangle environment to bin-angle
+if(WIN32)
+    set(EXPORT_SWANGLE_ENV_SCRIPT "export-swangle-env.bat")
+else()
+    set(EXPORT_SWANGLE_ENV_SCRIPT "export-swangle-env.sh")
+endif()
+configure_file(cmake/${EXPORT_SWANGLE_ENV_SCRIPT} ${ANGLE_OUTPUT_DIR}/${EXPORT_SWANGLE_ENV_SCRIPT})
+set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS "${ANGLE_OUTPUT_DIR}/${EXPORT_SWANGLE_ENV_SCRIPT}")
diff --git a/third_party/angle/cmake/export-swangle-env.bat b/third_party/angle/cmake/export-swangle-env.bat
new file mode 100644
index 0000000..0dd435e
--- /dev/null
+++ b/third_party/angle/cmake/export-swangle-env.bat
@@ -0,0 +1,2 @@
+set VK_ICD_FILENAMES=${CMAKE_BINARY_DIR}\${CMAKE_SYSTEM_NAME}\vk_swiftshader_icd.json
+set ANGLE_DEFAULT_PLATFORM=vulkan
diff --git a/third_party/angle/cmake/export-swangle-env.sh b/third_party/angle/cmake/export-swangle-env.sh
new file mode 100755
index 0000000..4879843
--- /dev/null
+++ b/third_party/angle/cmake/export-swangle-env.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+export VK_ICD_FILENAMES=set VK_ICD_FILENAMES=${CMAKE_BINARY_DIR}/${CMAKE_SYSTEM_NAME}/vk_swiftshader_icd.json
+export ANGLE_DEFAULT_PLATFORM="vulkan"