-1176530bf59096923b09e297cc304a337a915939
+master
include $(PREBUILT_STATIC_LIBRARY)
include $(CLEAR_VARS)
+LOCAL_MODULE := SPIRV-Tools-opt-prebuilt
+LOCAL_SRC_FILES := $(SRC_DIR)/external/shaderc/android_test/obj/local/$(TARGET_ARCH_ABI)/libSPIRV-Tools-opt.a
+include $(PREBUILT_STATIC_LIBRARY)
+
+include $(CLEAR_VARS)
LOCAL_MODULE := VkLayerValidationTests
LOCAL_SRC_FILES += $(SRC_DIR)/tests/layer_validation_tests.cpp \
$(SRC_DIR)/tests/vktestbinding.cpp \
$(SRC_DIR)/external/shaderc/libshaderc/include
LOCAL_STATIC_LIBRARIES := googletest_main layer_utils
-LOCAL_SHARED_LIBRARIES += shaderc-prebuilt glslang-prebuilt OGLCompiler-prebuilt OSDependent-prebuilt HLSL-prebuilt shaderc_util-prebuilt SPIRV-prebuilt SPIRV-Tools-prebuilt
+LOCAL_SHARED_LIBRARIES += shaderc-prebuilt glslang-prebuilt OGLCompiler-prebuilt OSDependent-prebuilt HLSL-prebuilt shaderc_util-prebuilt SPIRV-prebuilt SPIRV-Tools-prebuilt SPIRV-Tools-opt-prebuilt
LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR -fvisibility=hidden --include=$(SRC_DIR)/common/vulkan_wrapper.h
LOCAL_LDLIBS := -llog
LOCAL_LDFLAGS += -Wl,-Bsymbolic
$(SRC_DIR)/external/shaderc/libshaderc/include
LOCAL_STATIC_LIBRARIES := googletest_main layer_utils
-LOCAL_SHARED_LIBRARIES += shaderc-prebuilt glslang-prebuilt OGLCompiler-prebuilt OSDependent-prebuilt HLSL-prebuilt shaderc_util-prebuilt SPIRV-prebuilt SPIRV-Tools-prebuilt
+LOCAL_SHARED_LIBRARIES += shaderc-prebuilt glslang-prebuilt OGLCompiler-prebuilt OSDependent-prebuilt HLSL-prebuilt shaderc_util-prebuilt SPIRV-prebuilt SPIRV-Tools-prebuilt SPIRV-Tools-opt-prebuilt
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
-c63df792b2d535734cd0d1e6111de7ca29dcb555
+master
-3814effb879ab5a98a7b9288a4b4c7849d2bc8ac
+master
-e7a9e007384db16bc39dae01fadf4b73e754ab7e
+master
echo Creating local glslang repository %GLSLANG_DIR%
mkdir %GLSLANG_DIR%
cd %GLSLANG_DIR%
- git clone https://github.com/KhronosGroup/glslang.git .
+ git clone https://android.googlesource.com/platform/external/shaderc/glslang .
git checkout %GLSLANG_REVISION%
if not exist %GLSLANG_DIR%\SPIRV (
echo glslang source download failed!
echo Creating local spirv-tools repository %SPIRV_TOOLS_DIR%
mkdir %SPIRV_TOOLS_DIR%
cd %SPIRV_TOOLS_DIR%
- git clone https://github.com/KhronosGroup/SPIRV-Tools.git .
+ git clone https://android.googlesource.com/platform/external/shaderc/spirv-tools .
git checkout %SPIRV_TOOLS_REVISION%
if not exist %SPIRV_TOOLS_DIR%\source (
echo spirv-tools source download failed!
echo Creating local spirv-headers repository %SPIRV_HEADERS_DIR%
mkdir %SPIRV_HEADERS_DIR%
cd %SPIRV_HEADERS_DIR%
- git clone https://github.com/KhronosGroup/SPIRV-Headers.git .
+ git clone https://android.googlesource.com/platform/external/shaderc/spirv-headers .
git checkout %SPIRV_HEADERS_REVISION%
if not exist %SPIRV_HEADERS_DIR%\include (
echo spirv-headers source download failed!
echo Creating local shaderc repository %SHADERC_DIR%
mkdir %SHADERC_DIR%
cd %SHADERC_DIR%
- git clone https://github.com/google/shaderc.git .
+ git clone https://android.googlesource.com/platform/external/shaderc/shaderc .
git checkout %SHADERC_REVISION%
if not exist %SHADERC_DIR%\libshaderc (
echo shaderc source download failed!
echo "Creating local glslang repository ($BASEDIR/glslang)."
mkdir -p $BASEDIR/glslang
cd $BASEDIR/glslang
- git clone https://github.com/KhronosGroup/glslang.git .
+ git clone https://android.googlesource.com/platform/external/shaderc/glslang .
git checkout $GLSLANG_REVISION
}
echo "Creating local spirv-tools repository ($BASEDIR/spirv-tools)."
mkdir -p $BASEDIR/spirv-tools
cd $BASEDIR/spirv-tools
- git clone https://github.com/KhronosGroup/SPIRV-Tools.git .
+ git clone https://android.googlesource.com/platform/external/shaderc/spirv-tools .
git checkout $SPIRV_TOOLS_REVISION
}
echo "Creating local spirv-headers repository ($BASEDIR/spirv-tools/external/spirv-headers)."
mkdir -p $BASEDIR/spirv-tools/external/spirv-headers
cd $BASEDIR/spirv-tools/external/spirv-headers
- git clone https://github.com/KhronosGroup/SPIRV-Headers.git .
+ git clone https://android.googlesource.com/platform/external/shaderc/spirv-headers .
git checkout $SPIRV_HEADERS_REVISION
}
rm -rf $BASEDIR/shaderc
echo "Creating local shaderc repository ($BASEDIR/shaderc)."
cd $BASEDIR
- git clone https://github.com/google/shaderc.git
+ git clone https://android.googlesource.com/platform/external/shaderc/shaderc
cd shaderc
git checkout $SHADERC_REVISION
}