android: Update build to skip image layer

All image layer functionality has been moved into the core_validation
layer.

Change-Id: I980e279626e4e3f29c5068240260a737a5a707b1

5 files changed, 6 insertions, 22 deletions

diff --git a/build-android/android-generate.bat b/build-android/android-generate.bat
index 257dedc9..08892c74 100644
--- a/build-android/android-generate.bat
+++ b/build-android/android-generate.bat
@@ -41,14 +41,14 @@ copy /Y ..\layers\buffer_validation.cpp generated\common\
 REM create build-script root directory

 mkdir generated\gradle-build

 cd generated\gradle-build

-mkdir  core_validation image object_tracker parameter_validation swapchain threading unique_objects

+mkdir  core_validation object_tracker parameter_validation swapchain threading unique_objects

 cd ..\..

 mkdir generated\layer-src

 cd generated\layer-src

-mkdir  core_validation image object_tracker parameter_validation swapchain threading unique_objects

+mkdir  core_validation object_tracker parameter_validation swapchain threading unique_objects

 cd ..\..

 xcopy /s gradle-templates\*   generated\gradle-build\

-for %%G in (core_validation image object_tracker parameter_validation swapchain threading unique_objects) Do (

+for %%G in (core_validation object_tracker parameter_validation swapchain threading unique_objects) Do (

     copy ..\layers\%%G.cpp   generated\layer-src\%%G

     echo apply from: "../common.gradle"  > generated\gradle-build\%%G\build.gradle

 )

diff --git a/build-android/android-generate.sh b/build-android/android-generate.sh
index 662c4f01..d53ae6f1 100755
--- a/build-android/android-generate.sh
+++ b/build-android/android-generate.sh
@@ -41,8 +41,8 @@ cp -f ../layers/buffer_validation.cpp generated/common/
 # layer names and their original source files directory
 # 1 to 1 correspondence -- one layer one source file; additional files are copied
 # at fixup step
-declare layers=(core_validation image object_tracker parameter_validation swapchain threading unique_objects)
-declare src_dirs=(../layers ../layers ../layers ../layers ../layers ../layers ../layers)
+declare layers=(core_validation object_tracker parameter_validation swapchain threading unique_objects)
+declare src_dirs=(../layers ../layers ../layers ../layers ../layers ../layers)
 
 SRC_ROOT=generated/layer-src
 BUILD_ROOT=generated/gradle-build
diff --git a/build-android/gradle-templates/settings.gradle b/build-android/gradle-templates/settings.gradle
index d4c9c996..4a900fd7 100644
--- a/build-android/gradle-templates/settings.gradle
+++ b/build-android/gradle-templates/settings.gradle
@@ -1,5 +1,4 @@
 include ':core_validation',
-        ':image',
         ':object_tracker',
         ':parameter_validation',
         ':swapchain',
diff --git a/build-android/jni/Android.mk b/build-android/jni/Android.mk
index 4d325941..678133a5 100644
--- a/build-android/jni/Android.mk
+++ b/build-android/jni/Android.mk
@@ -49,21 +49,6 @@ LOCAL_LDFLAGS   += -Wl,--exclude-libs,ALL
 include $(BUILD_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := VkLayer_image
-LOCAL_SRC_FILES += $(LAYER_DIR)/layer-src/image/image.cpp
-LOCAL_SRC_FILES += $(LAYER_DIR)/common/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)
-
-include $(CLEAR_VARS)
 LOCAL_MODULE := VkLayer_parameter_validation
 LOCAL_SRC_FILES += $(LAYER_DIR)/layer-src/parameter_validation/parameter_validation.cpp
 LOCAL_SRC_FILES += $(LAYER_DIR)/common/vk_layer_table.cpp
diff --git a/build-android/jni/Application.mk b/build-android/jni/Application.mk
index 8b4fb09e..de07d7c8 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_image 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_swapchain 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