diff --git a/android/CMakeLists.txt b/android/CMakeLists.txt index b1f2f315..b6a66a0d 100644 --- a/android/CMakeLists.txt +++ b/android/CMakeLists.txt @@ -150,12 +150,7 @@ set_target_properties(SPIRV-Tools-opt PROPERTIES IMPORTED_LOCATION ${platform_spec_path}/glslang/libSPIRV-Tools-opt.a ) -add_library(SPVRemapper STATIC IMPORTED GLOBAL) -set_target_properties(SPVRemapper PROPERTIES - IMPORTED_LOCATION ${platform_spec_path}/glslang/libSPVRemapper.a -) - -set(glslang_libs_name glslang glslang-default-resource-limits MachineIndependent OGLCompiler OSDependent SPIRV SPIRV-Tools-opt SPIRV-Tools SPVRemapper GenericCodeGen) +set(glslang_libs_name glslang glslang-default-resource-limits MachineIndependent OGLCompiler OSDependent SPIRV SPIRV-Tools-opt SPIRV-Tools GenericCodeGen) ############################# TBB ############################# diff --git a/android/arm64-v8a/glslang/libSPIRV.a b/android/arm64-v8a/glslang/libSPIRV.a index b864d1df..a5e9c830 100644 Binary files a/android/arm64-v8a/glslang/libSPIRV.a and b/android/arm64-v8a/glslang/libSPIRV.a differ diff --git a/android/arm64-v8a/glslang/libSPVRemapper.a b/android/arm64-v8a/glslang/libSPVRemapper.a deleted file mode 100644 index 284b291e..00000000 Binary files a/android/arm64-v8a/glslang/libSPVRemapper.a and /dev/null differ diff --git a/android/armeabi-v7a/glslang/libSPIRV.a b/android/armeabi-v7a/glslang/libSPIRV.a index 18bf1722..86c3955b 100644 Binary files a/android/armeabi-v7a/glslang/libSPIRV.a and b/android/armeabi-v7a/glslang/libSPIRV.a differ diff --git a/android/armeabi-v7a/glslang/libSPVRemapper.a b/android/armeabi-v7a/glslang/libSPVRemapper.a deleted file mode 100644 index fb9d5822..00000000 Binary files a/android/armeabi-v7a/glslang/libSPVRemapper.a and /dev/null differ diff --git a/android/x86/glslang/libSPIRV.a b/android/x86/glslang/libSPIRV.a index 445ebf25..2b1bbf91 100644 Binary files a/android/x86/glslang/libSPIRV.a and b/android/x86/glslang/libSPIRV.a differ diff --git a/android/x86/glslang/libSPVRemapper.a b/android/x86/glslang/libSPVRemapper.a deleted file mode 100644 index 51cd36d9..00000000 Binary files a/android/x86/glslang/libSPVRemapper.a and /dev/null differ diff --git a/android/x86_64/glslang/libSPIRV.a b/android/x86_64/glslang/libSPIRV.a index 51e27742..8bc2ce03 100644 Binary files a/android/x86_64/glslang/libSPIRV.a and b/android/x86_64/glslang/libSPIRV.a differ diff --git a/android/x86_64/glslang/libSPVRemapper.a b/android/x86_64/glslang/libSPVRemapper.a deleted file mode 100644 index 4adb663a..00000000 Binary files a/android/x86_64/glslang/libSPVRemapper.a and /dev/null differ