Skip to content

Commit 7bab426

Browse files
committed
Update deps, adapt ndk-build glsang dpeendencies
ndk-build: - libshaderc_util depends on glslang (or link will fail) - remove Glslang's OSDependent lib (it's now empty)
1 parent 6d28483 commit 7bab426

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

Android.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ include $(ROOT_SHADERC_PATH)/libshaderc_util/Android.mk
1919
include $(ROOT_SHADERC_PATH)/libshaderc/Android.mk
2020

2121
ALL_LIBS:=libglslang.a \
22-
libOSDependent.a \
2322
libshaderc.a \
2423
libshaderc_util.a \
2524
libSPIRV.a \

DEPS

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ vars = {
77

88
'abseil_revision': '1315c900e1ddbb08a23e06eeb9a06450052ccb5e',
99
'effcee_revision': 'd74d33d93043952a99ae7cd7458baf6bc8df1da0',
10-
'glslang_revision': '5398d55e33dff7d26fecdd2c35808add986c558c',
10+
'glslang_revision': '12a17b7ce41436427e358608183100b1103274da',
1111
'googletest_revision': '1d17ea141d2c11b8917d2c7d029f1c4e2b9769b2',
1212
're2_revision': '4a8cee3dd3c3d81b6fe8b867811e193d5819df07',
13-
'spirv_headers_revision': 'f013f08e4455bcc1f0eed8e3dd5e2009682656d9',
14-
'spirv_tools_revision': 'b64a423b44f448df5464978173e28be12069b73c',
13+
'spirv_headers_revision': '2a9b6f951c7d6b04b6c21fe1bf3f475b68b84801',
14+
'spirv_tools_revision': 'd160e170d74ff45cb2a88dfb365bdfd896016f7c',
1515
}
1616

1717
deps = {

libshaderc_util/Android.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ LOCAL_SRC_FILES:=src/args.cc \
2727
src/shader_stage.cc \
2828
src/spirv_tools_wrapper.cc \
2929
src/version_profile.cc
30-
LOCAL_STATIC_LIBRARIES:=SPIRV SPIRV-Tools-opt
30+
LOCAL_STATIC_LIBRARIES:=SPIRV SPIRV-Tools-opt glslang
3131
LOCAL_C_INCLUDES:=$(LOCAL_PATH)/include
3232
include $(BUILD_STATIC_LIBRARY)

0 commit comments

Comments
 (0)