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)
google · Sep 12, 2024 · 7bab426 · 7bab426
1 parent 6d28483
commit 7bab426
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/Android.mk b/Android.mk
@@ -19,7 +19,6 @@ include $(ROOT_SHADERC_PATH)/libshaderc_util/Android.mk
 include $(ROOT_SHADERC_PATH)/libshaderc/Android.mk
 
 ALL_LIBS:=libglslang.a \
-	libOSDependent.a \
 	libshaderc.a \
 	libshaderc_util.a \
 	libSPIRV.a \

diff --git a/DEPS b/DEPS
@@ -7,11 +7,11 @@ vars = {
 
   'abseil_revision': '1315c900e1ddbb08a23e06eeb9a06450052ccb5e',
   'effcee_revision': 'd74d33d93043952a99ae7cd7458baf6bc8df1da0',
-  'glslang_revision': '5398d55e33dff7d26fecdd2c35808add986c558c',
+  'glslang_revision': '12a17b7ce41436427e358608183100b1103274da',
   'googletest_revision': '1d17ea141d2c11b8917d2c7d029f1c4e2b9769b2',
   're2_revision': '4a8cee3dd3c3d81b6fe8b867811e193d5819df07',
-  'spirv_headers_revision': 'f013f08e4455bcc1f0eed8e3dd5e2009682656d9',
-  'spirv_tools_revision': 'b64a423b44f448df5464978173e28be12069b73c',
+  'spirv_headers_revision': '2a9b6f951c7d6b04b6c21fe1bf3f475b68b84801',
+  'spirv_tools_revision': 'd160e170d74ff45cb2a88dfb365bdfd896016f7c',
 }
 
 deps = {

diff --git a/libshaderc_util/Android.mk b/libshaderc_util/Android.mk
@@ -27,6 +27,6 @@ LOCAL_SRC_FILES:=src/args.cc \
 		src/shader_stage.cc \
 		src/spirv_tools_wrapper.cc \
 		src/version_profile.cc
-LOCAL_STATIC_LIBRARIES:=SPIRV SPIRV-Tools-opt
+LOCAL_STATIC_LIBRARIES:=SPIRV SPIRV-Tools-opt glslang
 LOCAL_C_INCLUDES:=$(LOCAL_PATH)/include
 include $(BUILD_STATIC_LIBRARY)