build: Remove swapchain layer build from cmake
Also removed from android makefiles.
Change-Id: Ib4be1c737e9bd9fda21210ed7b234b9242b7b8f5
diff --git a/build-android/cmake/layerlib/CMakeLists.txt b/build-android/cmake/layerlib/CMakeLists.txt
index c8455c8..2177fd6 100644
--- a/build-android/cmake/layerlib/CMakeLists.txt
+++ b/build-android/cmake/layerlib/CMakeLists.txt
@@ -116,14 +116,4 @@
${SRC_DIR}/loader)
target_link_libraries(VkLayer_unique_objects PRIVATE log layer_utils)
-add_library(VkLayer_swapchain SHARED
- ${SRC_DIR}/layers/swapchain.cpp
- ${SRC_DIR}/layers/vk_layer_table.cpp)
-target_include_directories(VkLayer_swapchain PRIVATE
- ${SRC_DIR}/include
- ${SRC_DIR}/layers
- ${COMMON_DIR}/include
- ${SRC_DIR}/loader)
-target_link_libraries(VkLayer_swapchain PRIVATE log layer_utils)
-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_clone}")
diff --git a/build-android/jni/Android.mk b/build-android/jni/Android.mk
index cd0d606..f59c101 100644
--- a/build-android/jni/Android.mk
+++ b/build-android/jni/Android.mk
@@ -111,21 +111,6 @@
LOCAL_LDFLAGS += -Wl,--exclude-libs,ALL
include $(BUILD_SHARED_LIBRARY)
-include $(CLEAR_VARS)
-LOCAL_MODULE := VkLayer_swapchain
-LOCAL_SRC_FILES += $(SRC_DIR)/layers/swapchain.cpp
-LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp
-LOCAL_C_INCLUDES += $(SRC_DIR)/include \
- $(SRC_DIR)/layers \
- $(LAYER_DIR)/include \
- $(SRC_DIR)/loader
-LOCAL_STATIC_LIBRARIES += layer_utils
-LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR -fvisibility=hidden
-LOCAL_LDLIBS := -llog
-LOCAL_LDFLAGS += -Wl,-Bsymbolic
-LOCAL_LDFLAGS += -Wl,--exclude-libs,ALL
-include $(BUILD_SHARED_LIBRARY)
-
# Pull in prebuilt shaderc
include $(CLEAR_VARS)
LOCAL_MODULE := shaderc-prebuilt
diff --git a/build-android/jni/Application.mk b/build-android/jni/Application.mk
index de07d7c..ded5169 100644
--- a/build-android/jni/Application.mk
+++ b/build-android/jni/Application.mk
@@ -16,6 +16,6 @@
APP_ABI := armeabi-v7a arm64-v8a x86 x86_64 mips mips64
APP_PLATFORM := android-22
APP_STL := gnustl_static
-APP_MODULES := layer_utils VkLayer_core_validation VkLayer_parameter_validation VkLayer_object_tracker VkLayer_threading VkLayer_swapchain VkLayer_unique_objects VkLayerValidationTests VulkanLayerValidationTests
+APP_MODULES := layer_utils VkLayer_core_validation VkLayer_parameter_validation VkLayer_object_tracker VkLayer_threading VkLayer_unique_objects VkLayerValidationTests VulkanLayerValidationTests
APP_CPPFLAGS += -std=c++11 -DVK_PROTOTYPES -Wall -Werror -Wno-unused-function -Wno-unused-const-variable -mxgot
NDK_TOOLCHAIN_VERSION := clang
diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt
index 6e254ff..eb7a351 100644
--- a/layers/CMakeLists.txt
+++ b/layers/CMakeLists.txt
@@ -30,7 +30,6 @@
VkLayer_object_tracker
VkLayer_unique_objects
VkLayer_parameter_validation
- VkLayer_swapchain
VkLayer_threading
)
@@ -170,7 +169,6 @@
add_vk_layer(core_validation core_validation.cpp vk_layer_table.cpp descriptor_sets.cpp buffer_validation.cpp shader_validation.cpp)
add_vk_layer(object_tracker object_tracker.cpp vk_layer_table.cpp)
-add_vk_layer(swapchain swapchain.cpp vk_layer_table.cpp)
# generated
add_vk_layer(threading threading.cpp thread_check.h vk_layer_table.cpp)
add_vk_layer(unique_objects unique_objects.cpp unique_objects_wrappers.h vk_layer_table.cpp)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 3bffb72..5d8af49 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -121,7 +121,6 @@
add_dependencies(vk_layer_validation_tests
VkLayer_core_validation
VkLayer_object_tracker
- VkLayer_swapchain
VkLayer_threading
VkLayer_unique_objects
VkLayer_parameter_validation