diff --git a/.github/workflows/android-continuous.yml b/.github/workflows/android-continuous.yml index 326ceb6546..e9aebe8e76 100644 --- a/.github/workflows/android-continuous.yml +++ b/.github/workflows/android-continuous.yml @@ -29,10 +29,6 @@ jobs: with: name: filamat-android-full path: out/filamat-android-release.aar - - uses: actions/upload-artifact@v1.0.0 - with: - name: filamat-android-lite - path: out/filamat-android-lite-release.aar - uses: actions/upload-artifact@v1.0.0 with: name: gltfio-android-release diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6f2422b1b6..fa12f3d322 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -124,7 +124,6 @@ jobs: cd ../.. mv out/filament-android-release.aar out/filament-${TAG}-android.aar mv out/filamat-android-release.aar out/filamat-${TAG}-android.aar - mv out/filamat-android-lite-release.aar out/filamat-${TAG}-lite-android.aar mv out/gltfio-android-release.aar out/gltfio-${TAG}-android.aar mv out/filament-utils-android-release.aar out/filament-utils-${TAG}-android.aar - name: Sign sample-gltf-viewer diff --git a/build.sh b/build.sh index daaa419f7e..7c9bba84a2 100755 --- a/build.sh +++ b/build.sh @@ -495,13 +495,13 @@ function build_android { if [[ "${INSTALL_COMMAND}" ]]; then echo "Installing out/filamat-android-debug.aar..." - cp filamat-android/build/outputs/aar/filamat-android-full-debug.aar ../out/filamat-android-debug.aar + cp filamat-android/build/outputs/aar/filamat-android-debug.aar ../out/filamat-android-debug.aar echo "Installing out/filament-android-debug.aar..." cp filament-android/build/outputs/aar/filament-android-debug.aar ../out/ echo "Installing out/gltfio-android-debug.aar..." - cp gltfio-android/build/outputs/aar/gltfio-android-full-debug.aar ../out/gltfio-android-debug.aar + cp gltfio-android/build/outputs/aar/gltfio-android-debug.aar ../out/gltfio-android-debug.aar echo "Installing out/filament-utils-android-debug.aar..." cp filament-utils-android/build/outputs/aar/filament-utils-android-debug.aar ../out/filament-utils-android-debug.aar @@ -544,13 +544,13 @@ function build_android { if [[ "${INSTALL_COMMAND}" ]]; then echo "Installing out/filamat-android-release.aar..." - cp filamat-android/build/outputs/aar/filamat-android-full-release.aar ../out/filamat-android-release.aar + cp filamat-android/build/outputs/aar/filamat-android-release.aar ../out/filamat-android-release.aar echo "Installing out/filament-android-release.aar..." cp filament-android/build/outputs/aar/filament-android-release.aar ../out/ echo "Installing out/gltfio-android-release.aar..." - cp gltfio-android/build/outputs/aar/gltfio-android-full-release.aar ../out/gltfio-android-release.aar + cp gltfio-android/build/outputs/aar/gltfio-android-release.aar ../out/gltfio-android-release.aar echo "Installing out/filament-utils-android-release.aar..." cp filament-utils-android/build/outputs/aar/filament-utils-android-release.aar ../out/filament-utils-android-release.aar diff --git a/build/common/test_list.txt b/build/common/test_list.txt index 39a71c5f4f..3121fccfd0 100644 --- a/build/common/test_list.txt +++ b/build/common/test_list.txt @@ -5,7 +5,6 @@ libs/math/test_math libs/image/test_image compare libs/image/tests/reference/ libs/utils/test_utils libs/filamat/test_filamat -libs/filamat/test_filamat_lite tools/matc/test_matc tools/cmgen/test_cmgen compare tools/glslminifier/test_glslminifier