android: Build cube for android

Change-Id: I0ff87c345098d51a24115bbb33cbb60a488efb45

8 files changed, 7 insertions, 340 deletions

diff --git a/build-android/android-generate.bat b/build-android/android-generate.bat
deleted file mode 100644
index 06add180..00000000
--- a/build-android/android-generate.bat
+++ /dev/null
@@ -1,64 +0,0 @@
-@echo off
-REM # Copyright 2015 The Android Open Source Project
-REM # Copyright (C) 2015 Valve Corporation
-REM
-REM # Licensed under the Apache License, Version 2.0 (the "License");
-REM # you may not use this file except in compliance with the License.
-REM # You may obtain a copy of the License at
-REM
-REM #      http://www.apache.org/licenses/LICENSE-2.0
-REM
-REM # Unless required by applicable law or agreed to in writing, software
-REM # distributed under the License is distributed on an "AS IS" BASIS,
-REM # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-REM # See the License for the specific language governing permissions and
-REM # limitations under the License.
-
-if exist generated (
-  rmdir /s /q generated
-)
-mkdir generated\include generated\common
-
-cd generated/include
-py -3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml vk_safe_struct.h
-py -3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml vk_safe_struct.cpp
-py -3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml vk_enum_string_helper.h
-py -3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml vk_object_types.h
-py -3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml vk_dispatch_table_helper.h
-py -3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml thread_check.h
-py -3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml parameter_validation.cpp
-py -3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml unique_objects_wrappers.h
-py -3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml vk_layer_dispatch_table.h
-py -3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml vk_extension_helper.h
-py -3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml object_tracker.cpp
-py -3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml vk_typemap_helper.h
-
-set SPIRV_TOOLS_PATH=../../third_party/shaderc/third_party/spirv-tools
-set SPIRV_TOOLS_UUID=spirv_tools_uuid.txt
-
-if exist %SPIRV_TOOLS_PATH% (
-
-  echo Found spirv-tools, using git_dir for external_revision_generator.py
-  py -3 ../../../scripts/external_revision_generator.py ^
-    --git_dir %SPIRV_TOOLS_PATH% ^
-    -s SPIRV_TOOLS_COMMIT_ID ^
-    -o spirv_tools_commit_id.h
-
-) else (
-
-  echo No spirv-tools git_dir found, generating UUID for external_revision_generator.py
-
-  REM Ensure uuidgen is installed, this should error if not found
-  uuidgen.exe -v
-
-  uuidgen.exe > %SPIRV_TOOLS_UUID%
-  type %SPIRV_TOOLS_UUID%
-  py -3 ../../../scripts/external_revision_generator.py ^
-    --rev_file %SPIRV_TOOLS_UUID% ^
-    -s SPIRV_TOOLS_COMMIT_ID ^
-    -o spirv_tools_commit_id.h
-
-)
-
-cd ../..
-
diff --git a/build-android/android-generate.sh b/build-android/android-generate.sh
deleted file mode 100755
index 5540edcd..00000000
--- a/build-android/android-generate.sh
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/bin/bash
-
-# Copyright 2015 The Android Open Source Project
-# Copyright (C) 2015 Valve Corporation
-
-# 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.
-
-dir=$(cd -P -- "$(dirname -- "$0")" && pwd -P)
-cd $dir
-
-rm -rf generated
-mkdir -p generated/include generated/common
-
-( cd generated/include; python3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml vk_safe_struct.h )
-( cd generated/include; python3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml vk_safe_struct.cpp )
-( cd generated/include; python3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml vk_enum_string_helper.h )
-( cd generated/include; python3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml vk_object_types.h )
-( cd generated/include; python3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml vk_dispatch_table_helper.h )
-( cd generated/include; python3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml thread_check.h )
-( cd generated/include; python3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml parameter_validation.cpp )
-( cd generated/include; python3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml unique_objects_wrappers.h )
-( cd generated/include; python3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml vk_loader_extensions.h )
-( cd generated/include; python3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml vk_loader_extensions.c )
-( cd generated/include; python3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml vk_layer_dispatch_table.h )
-( cd generated/include; python3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml vk_extension_helper.h )
-( cd generated/include; python3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml object_tracker.cpp )
-( cd generated/include; python3 ../../../scripts/lvl_genvk.py -registry ../../../scripts/vk.xml vk_typemap_helper.h )
-
-SPIRV_TOOLS_PATH=../../third_party/shaderc/third_party/spirv-tools
-SPIRV_TOOLS_UUID=spirv_tools_uuid.txt
-
-set -e
-
-( cd generated/include;
-
-  if [[ -d $SPIRV_TOOLS_PATH ]]; then
-
-    echo Found spirv-tools, using git_dir for external_revision_generator.py
-
-    python3 ../../../scripts/external_revision_generator.py \
-      --git_dir $SPIRV_TOOLS_PATH \
-      -s SPIRV_TOOLS_COMMIT_ID \
-      -o spirv_tools_commit_id.h
-
-  else
-
-    echo No spirv-tools git_dir found, generating UUID for external_revision_generator.py
-
-    # Ensure uuidgen is installed, this should error if not found
-    uuidgen --v
-
-    uuidgen > $SPIRV_TOOLS_UUID;
-    cat $SPIRV_TOOLS_UUID;
-    python3 ../../../scripts/external_revision_generator.py \
-      --rev_file $SPIRV_TOOLS_UUID \
-      -s SPIRV_TOOLS_COMMIT_ID \
-      -o spirv_tools_commit_id.h
-
-  fi
-)
-
-
-exit 0
diff --git a/build-android/build_all.sh b/build-android/build_all.sh
index b2f48c0c..ee310952 100755
--- a/build-android/build_all.sh
+++ b/build-android/build_all.sh
@@ -44,9 +44,7 @@ findtool jarsigner
 
 set -ev
 
-LAYER_BUILD_DIR=$PWD
-DEMO_BUILD_DIR=$PWD/../demos/android
-echo LAYER_BUILD_DIR="${LAYER_BUILD_DIR}"
+DEMO_BUILD_DIR=$PWD/../cube/android
 echo DEMO_BUILD_DIR="${DEMO_BUILD_DIR}"
 
 function create_APK() {
@@ -57,20 +55,6 @@ function create_APK() {
 }
 
 #
-# build layers
-#
-./update_external_sources_android.sh --no-build
-./android-generate.sh
-ndk-build -j $cores
-
-#
-# build VulkanLayerValidationTests APK
-#
-mkdir -p bin/libs/lib
-cp -r $LAYER_BUILD_DIR/libs/* $LAYER_BUILD_DIR/bin/libs/lib/
-create_APK VulkanLayerValidationTests
-
-#
 # build cube APKs (with and without layers)
 #
 (
@@ -81,19 +65,15 @@ mkdir -p $DEMO_BUILD_DIR/cube/bin/libs/lib
 cp -r $DEMO_BUILD_DIR/libs/* $DEMO_BUILD_DIR/cube/bin/libs/lib/
 cd $DEMO_BUILD_DIR/cube
 create_APK cube
+# Todo: support cube with layers
 # And one with validation layers
-mkdir -p $DEMO_BUILD_DIR/cube-with-layers/bin/libs/lib
-cp -r $DEMO_BUILD_DIR/libs/* $DEMO_BUILD_DIR/cube-with-layers/bin/libs/lib/
-cp -r $LAYER_BUILD_DIR/libs/* $DEMO_BUILD_DIR/cube-with-layers/bin/libs/lib/
-cd $DEMO_BUILD_DIR/cube-with-layers
-create_APK cube-with-layers
+#mkdir -p $DEMO_BUILD_DIR/cube-with-layers/bin/libs/lib
+#cp -r $DEMO_BUILD_DIR/libs/* $DEMO_BUILD_DIR/cube-with-layers/bin/libs/lib/
+#cp -r $LAYER_BUILD_DIR/libs/* $DEMO_BUILD_DIR/cube-with-layers/bin/libs/lib/
+#cd $DEMO_BUILD_DIR/cube-with-layers
+#create_APK cube-with-layers
 popd
 )
 
-#
-# build Smoke with layers
-#
-# TODO
-
 echo Builds succeeded
 exit 0
diff --git a/build-android/glslang_revision_android b/build-android/glslang_revision_android
deleted file mode 100644
index 8843893c..00000000
--- a/build-android/glslang_revision_android
+++ /dev/null
@@ -1 +0,0 @@
-23ea3db3e5ea16b4964e9e3b5fee88bfc267fc57
diff --git a/build-android/glslang_url_android b/build-android/glslang_url_android
deleted file mode 100644
index d6610008..00000000
--- a/build-android/glslang_url_android
+++ /dev/null
@@ -1 +0,0 @@
-https://github.com/KhronosGroup/glslang.git
diff --git a/build-android/jni/Android.mk b/build-android/jni/Android.mk
index 2915de10..204f7552 100644
--- a/build-android/jni/Android.mk
+++ b/build-android/jni/Android.mk
@@ -15,178 +15,6 @@
 
 LOCAL_PATH := $(call my-dir)
 SRC_DIR := ../..
-LAYER_DIR := ../generated
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := layer_utils
-LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_config.cpp
-LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_extension_utils.cpp
-LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_utils.cpp
-LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_format_utils.cpp
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(SRC_DIR)/include \
-                    $(LOCAL_PATH)/$(LAYER_DIR)/include \
-                    $(LOCAL_PATH)/$(SRC_DIR)/layers \
-                    $(LOCAL_PATH)/$(SRC_DIR)/loader
-LOCAL_CPPFLAGS += -std=c++11 -Wall -Werror -Wno-unused-function -Wno-unused-const-variable
-LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR -DVK_PROTOTYPES -fvisibility=hidden
-include $(BUILD_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := VkLayer_core_validation
-LOCAL_SRC_FILES += $(SRC_DIR)/layers/core_validation.cpp
-LOCAL_SRC_FILES += $(SRC_DIR)/layers/descriptor_sets.cpp
-LOCAL_SRC_FILES += $(SRC_DIR)/layers/buffer_validation.cpp
-LOCAL_SRC_FILES += $(SRC_DIR)/layers/shader_validation.cpp
-LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp
-LOCAL_SRC_FILES += $(SRC_DIR)/layers/xxhash.c
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(SRC_DIR)/include \
-                    $(LOCAL_PATH)/$(SRC_DIR)/layers \
-                    $(LOCAL_PATH)/$(LAYER_DIR)/include \
-                    $(LOCAL_PATH)/$(SRC_DIR)/loader
-LOCAL_STATIC_LIBRARIES += layer_utils glslang SPIRV-Tools
-LOCAL_CPPFLAGS += -std=c++11 -Wall -Werror -Wno-unused-function -Wno-unused-const-variable
-LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR -DVK_PROTOTYPES -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)/include/parameter_validation.cpp
-LOCAL_SRC_FILES += $(SRC_DIR)/layers/parameter_validation_utils.cpp
-LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(SRC_DIR)/include \
-                    $(LOCAL_PATH)/$(LAYER_DIR)/include \
-                    $(LOCAL_PATH)/$(SRC_DIR)/layers \
-                    $(LOCAL_PATH)/$(SRC_DIR)/loader
-LOCAL_STATIC_LIBRARIES += layer_utils
-LOCAL_CPPFLAGS += -std=c++11 -DVK_PROTOTYPES -Wall -Werror -Wno-unused-function -Wno-unused-const-variable
-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_object_tracker
-LOCAL_SRC_FILES += $(LAYER_DIR)/include/object_tracker.cpp
-LOCAL_SRC_FILES += $(SRC_DIR)/layers/object_tracker_utils.cpp
-LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(SRC_DIR)/include \
-                    $(LOCAL_PATH)/$(SRC_DIR)/layers \
-                    $(LOCAL_PATH)/$(LAYER_DIR)/include \
-                    $(LOCAL_PATH)/$(SRC_DIR)/loader
-LOCAL_STATIC_LIBRARIES += layer_utils
-LOCAL_CPPFLAGS += -std=c++11 -DVK_PROTOTYPES -Wall -Werror -Wno-unused-function -Wno-unused-const-variable
-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_threading
-LOCAL_SRC_FILES += $(SRC_DIR)/layers/threading.cpp
-LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(SRC_DIR)/include \
-                    $(LOCAL_PATH)/$(SRC_DIR)/layers \
-                    $(LOCAL_PATH)/$(LAYER_DIR)/include \
-                    $(LOCAL_PATH)/$(SRC_DIR)/loader
-LOCAL_STATIC_LIBRARIES += layer_utils
-LOCAL_CPPFLAGS += -std=c++11 -DVK_PROTOTYPES -Wall -Werror -Wno-unused-function -Wno-unused-const-variable
-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_unique_objects
-LOCAL_SRC_FILES += $(SRC_DIR)/layers/unique_objects.cpp
-LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(SRC_DIR)/include \
-                    $(LOCAL_PATH)/$(SRC_DIR)/layers \
-                    $(LOCAL_PATH)/$(LAYER_DIR)/include \
-                    $(LOCAL_PATH)/$(SRC_DIR)/loader
-LOCAL_STATIC_LIBRARIES += layer_utils
-LOCAL_CPPFLAGS += -std=c++11 -Wall -Werror -Wno-unused-function -Wno-unused-const-variable
-LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR -DVK_PROTOTYPES -fvisibility=hidden
-LOCAL_LDLIBS    := -llog
-LOCAL_LDFLAGS   += -Wl,-Bsymbolic
-LOCAL_LDFLAGS   += -Wl,--exclude-libs,ALL
-include $(BUILD_SHARED_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := VkLayerValidationTests
-LOCAL_SRC_FILES += $(SRC_DIR)/tests/layer_validation_tests.cpp \
-                   $(SRC_DIR)/tests/vktestbinding.cpp \
-                   $(SRC_DIR)/tests/vktestframeworkandroid.cpp \
-                   $(SRC_DIR)/tests/vkrenderframework.cpp \
-                   $(SRC_DIR)/common/vulkan_wrapper.cpp
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(SRC_DIR)/include \
-                    $(LOCAL_PATH)/$(LAYER_DIR)/include \
-                    $(LOCAL_PATH)/$(SRC_DIR)/layers \
-                    $(LOCAL_PATH)/$(SRC_DIR)/libs \
-                    $(LOCAL_PATH)/$(SRC_DIR)/common
-
-LOCAL_STATIC_LIBRARIES := googletest_main layer_utils shaderc
-LOCAL_CPPFLAGS += -std=c++11 -DVK_PROTOTYPES -Wall -Werror -Wno-unused-function -Wno-unused-const-variable
-LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR -fvisibility=hidden --include=$(SRC_DIR)/common/vulkan_wrapper.h
-LOCAL_LDLIBS := -llog
-LOCAL_LDFLAGS   += -Wl,-Bsymbolic
-LOCAL_LDFLAGS   += -Wl,--exclude-libs,ALL
-include $(BUILD_EXECUTABLE)
-
-# Note: The following module is similar in name to the executable, but differs so that loader won't enumerate the resulting .so
-include $(CLEAR_VARS)
-LOCAL_MODULE := VulkanLayerValidationTests
-LOCAL_SRC_FILES += $(SRC_DIR)/tests/layer_validation_tests.cpp \
-                   $(SRC_DIR)/tests/vktestbinding.cpp \
-                   $(SRC_DIR)/tests/vktestframeworkandroid.cpp \
-                   $(SRC_DIR)/tests/vkrenderframework.cpp \
-                   $(SRC_DIR)/common/vulkan_wrapper.cpp
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(SRC_DIR)/include \
-                    $(LOCAL_PATH)/$(LAYER_DIR)/include \
-                    $(LOCAL_PATH)/$(SRC_DIR)/layers \
-                    $(LOCAL_PATH)/$(SRC_DIR)/libs \
-                    $(LOCAL_PATH)/$(SRC_DIR)/common
-
-LOCAL_STATIC_LIBRARIES := googletest_main layer_utils shaderc
-LOCAL_CPPFLAGS += -std=c++11 -DVK_PROTOTYPES -Wall -Werror -Wno-unused-function -Wno-unused-const-variable
-LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR -fvisibility=hidden -DVALIDATION_APK --include=$(SRC_DIR)/common/vulkan_wrapper.h
-LOCAL_WHOLE_STATIC_LIBRARIES += android_native_app_glue
-LOCAL_LDLIBS := -llog -landroid
-LOCAL_LDFLAGS := -u ANativeActivity_onCreate
-include $(BUILD_SHARED_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := vkjson
-LOCAL_SRC_FILES += $(SRC_DIR)/libs/vkjson/vkjson.cc \
-                   $(SRC_DIR)/libs/vkjson/vkjson_instance.cc \
-                   $(SRC_DIR)/common/vulkan_wrapper.cpp \
-                   $(SRC_DIR)/loader/cJSON.c
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(SRC_DIR)/include \
-                    $(LOCAL_PATH)/$(SRC_DIR)/loader
-
-LOCAL_CPPFLAGS += -std=c++11 -DVK_PROTOTYPES -Wall -Werror -Wno-unused-function -Wno-unused-const-variable
-LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR -fvisibility=hidden --include=$(SRC_DIR)/common/vulkan_wrapper.h
-include $(BUILD_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := vkjson_info
-LOCAL_SRC_FILES += $(SRC_DIR)/libs/vkjson/vkjson_info.cc \
-                   $(SRC_DIR)/common/vulkan_wrapper.cpp
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(SRC_DIR)/loader \
-                    $(LOCAL_PATH)/$(SRC_DIR)/include
-
-LOCAL_STATIC_LIBRARIES += vkjson
-LOCAL_CPPFLAGS += -std=c++11 -DVK_PROTOTYPES -Wall -Werror -Wno-unused-function -Wno-unused-const-variable
-LOCAL_CPPFLAGS += -Wno-sign-compare -DVK_USE_PLATFORM_ANDROID_KHR --include=$(SRC_DIR)/common/vulkan_wrapper.h
-LOCAL_LDLIBS := -llog
-LOCAL_LDFLAGS += -Wl,--exclude-libs,ALL
-include $(BUILD_EXECUTABLE)
 
 $(call import-module,android/native_app_glue)
-$(call import-module,third_party/googletest)
 $(call import-module,third_party/shaderc)
diff --git a/build-android/spirv-headers_revision_android b/build-android/spirv-headers_revision_android
deleted file mode 100644
index f6cc8e50..00000000
--- a/build-android/spirv-headers_revision_android
+++ /dev/null
@@ -1 +0,0 @@
-ce309203d7eceaf908bea8862c27f3e0749f7d00
diff --git a/build-android/spirv-headers_url_android b/build-android/spirv-headers_url_android
deleted file mode 100644
index c37214f0..00000000
--- a/build-android/spirv-headers_url_android
+++ /dev/null
@@ -1 +0,0 @@
-https://github.com/KhronosGroup/SPIRV-Headers.git