commit e7f90b61e8316b34c524fe3879be1c22a7c7cfd3
author Geoffrey Martin-Noble <gcmn@google.com> Wed Jul 29 14:32:26 2020 -0700
committer GitHub <noreply@github.com> Wed Jul 29 14:32:26 2020 -0700
tree fea9214eea533cfa1d216308545f7c106eb56dba
parent 48efada89344d951627313e8ae540a86e8890cc8

Revert addition of DYLIB-LLVM-AOT as a default backend (#2702)

This is a partial reversion of https://github.com/google/iree/pull/2639.
The change to Bazel build scripts was preserved to keep the uniform
environment between Bazel builds running with RBE.

Part of https://github.com/google/iree/issues/2645

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c4c5504..b761338 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -116,7 +116,7 @@
 
 # List of all target backends to be built by default:
 set(IREE_ALL_TARGET_BACKENDS
-  DYLIB-LLVM-AOT
+  # TODO(#2645): Add DYLIB-LLVM-AOT when it doesn't require an env var
   LLVM-IR
   Vulkan-SPIRV
   VMLA

build_tools/bazel_to_cmake/bazel_to_cmake_converter.py

diff --git a/build_tools/bazel_to_cmake/bazel_to_cmake_converter.py b/build_tools/bazel_to_cmake/bazel_to_cmake_converter.py
index 9add36f..bc40c97 100644
--- a/build_tools/bazel_to_cmake/bazel_to_cmake_converter.py
+++ b/build_tools/bazel_to_cmake/bazel_to_cmake_converter.py
@@ -43,7 +43,6 @@
     self.FLATBUFFER_SUPPORTS_REFLECTIONS = False
     self.PLATFORM_VULKAN_LOADER_COPTS = []
     self.IREE_DRIVER_MODULES = [
-        "//iree/hal/dylib:dylib_driver_module",
         "//iree/hal/vmla:vmla_driver_module",
         "//iree/hal/vulkan:vulkan_driver_module",
         "//iree/hal/llvmjit:llvmjit_driver_module",

build_tools/cmake/iree_check_test.cmake

diff --git a/build_tools/cmake/iree_check_test.cmake b/build_tools/cmake/iree_check_test.cmake
index 82ac9c7..93fd934 100644
--- a/build_tools/cmake/iree_check_test.cmake
+++ b/build_tools/cmake/iree_check_test.cmake
@@ -243,8 +243,8 @@
   )
 
   if(NOT DEFINED _RULE_TARGET_BACKENDS AND NOT DEFINED _RULE_DRIVERS)
-    set(_RULE_TARGET_BACKENDS "vmla" "vulkan-spirv" "llvm-ir" "dylib-llvm-aot")
-    set(_RULE_DRIVERS "vmla" "vulkan" "llvm" "dylib")
+    set(_RULE_TARGET_BACKENDS "vmla" "vulkan-spirv" "llvm-ir")
+    set(_RULE_DRIVERS "vmla" "vulkan" "llvm")
   endif()
 
   list(LENGTH _RULE_TARGET_BACKENDS _TARGET_BACKEND_COUNT)

iree/modules/check/CMakeLists.txt

diff --git a/iree/modules/check/CMakeLists.txt b/iree/modules/check/CMakeLists.txt
index 0c6c103..0a016be 100644
--- a/iree/modules/check/CMakeLists.txt
+++ b/iree/modules/check/CMakeLists.txt
@@ -57,7 +57,6 @@
     iree::base::status
     iree::base::target_platform
     iree::base::tracing
-    iree::hal::dylib::dylib_driver_module
     iree::hal::llvmjit::llvmjit_driver_module
     iree::hal::vmla::vmla_driver_module
     iree::hal::vulkan::vulkan_driver_module