diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 918fd841cf..c95151ba7c 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -37,19 +37,20 @@ jobs: - name: Build SwiftShader shell: bash run: | + cd swiftshader export PATH=$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/bin/:$PATH - git -C SwiftShader submodule init - git -C SwiftShader config submodule."third_party/cppdap".url "$srcdir/cppdap" - git -C SwiftShader config submodule."third_party/googletest".url "$srcdir/googletest" - git -C SwiftShader config submodule."third_party/json".url "$srcdir/json" - git -C SwiftShader config submodule."third_party/libbacktrace/src".url "$srcdir/libbacktrace" - git -C SwiftShader config submodule."third_party/PowerVR_Examples".url "$srcdir/Native_SDK" - git -C SwiftShader config submodule."third_party/benchmark".url "$srcdir/benchmark" - git -C SwiftShader config submodule."third_party/glslang".url "$srcdir/glslang" + git submodule init + git config submodule."third_party/cppdap".url "$srcdir/cppdap" + git config submodule."third_party/googletest".url "$srcdir/googletest" + git config submodule."third_party/json".url "$srcdir/json" + git config submodule."third_party/libbacktrace/src".url "$srcdir/libbacktrace" + git config submodule."third_party/PowerVR_Examples".url "$srcdir/Native_SDK" + git config submodule."third_party/benchmark".url "$srcdir/benchmark" + git config submodule."third_party/glslang".url "$srcdir/glslang" # this repo is not publicly accessible so we won't fetch it - git -C SwiftShader config submodule."third_party/git-hooks".update none - git -C SwiftShader config submodule."third_party/llvm-project".update none - git -C SwiftShader -c protocol.file.allow=always submodule update + git config submodule."third_party/git-hooks".update none + git config submodule."third_party/llvm-project".update none + git -c protocol.file.allow=always submodule update cmake \ -G Ninja \