Add CMake support for building Android and Catch2 Tests
Diffs=
797fb4cbd Add CMake support for building Android and Catch2 Tests (#5468)
Co-authored-by: Umberto Sonnino <umberto@rive.app>
diff --git a/.rive_head b/.rive_head
index 6aa03ad..45184f9 100644
--- a/.rive_head
+++ b/.rive_head
@@ -1 +1 @@
-7ee5f7d5a9af82205d32bfb979fdaac412b51cad
+797fb4cbd547509dac0a34e1039bfad5de8cd80c
diff --git a/skia/dependencies/cache_helper.sh b/skia/dependencies/cache_helper.sh
index 8455d76..70ecda2 100755
--- a/skia/dependencies/cache_helper.sh
+++ b/skia/dependencies/cache_helper.sh
@@ -64,7 +64,7 @@
mkdir -p $SKIA_DIR
curl --output $SKIA_DIR/$ARCHIVE_FILE_NAME $ARCHIVE_URL
pushd $SKIA_DIR
- tar -xf $ARCHIVE_FILE_NAME out include $ARCHIVE_CONTENTS_NAME third_party
+ tar -xf $ARCHIVE_FILE_NAME out include $ARCHIVE_CONTENTS_NAME third_party modules
}
is_build_cached_remotely() {
@@ -82,7 +82,7 @@
echo $EXPECTED_ARCHIVE_CONTENTS > $SKIA_DIR_NAME/$ARCHIVE_CONTENTS_NAME
# not really sure about this third party biz
# also we are caching on a per architecture path here, but out could contain more :thinking:
- tar -C $SKIA_DIR_NAME -cf $SKIA_DIR_NAME/$ARCHIVE_FILE_NAME $OUTPUT_CACHE $ARCHIVE_CONTENTS_NAME include third_party/libpng third_party/externals/libpng
+ tar -C $SKIA_DIR_NAME -cf $SKIA_DIR_NAME/$ARCHIVE_FILE_NAME $OUTPUT_CACHE $ARCHIVE_CONTENTS_NAME include third_party/libpng third_party/externals/libpng modules
popd
# # if we're configured to upload the archive back into our cache, lets do it!
echo "Uploading to s3://2d-public/archives/$ARCHIVE_FILE_NAME"
diff --git a/skia/dependencies/make_skia_android.sh b/skia/dependencies/make_skia_android.sh
index e3f5e68..039a455 100755
--- a/skia/dependencies/make_skia_android.sh
+++ b/skia/dependencies/make_skia_android.sh
@@ -105,9 +105,10 @@
else
getSkia
build_skia_android
+ # (umberto) commenting this out for now for CMake builds.
# hmm not the appiest with this guy
- if [ "$CONFIG" != "debug" ]; then
- OUTPUT_CACHE=out/"${CONFIG}"/$ARCH upload_cache
- fi
+ # if [ "$CONFIG" != "debug" ]; then
+ OUTPUT_CACHE=out/"${CONFIG}"/$ARCH upload_cache
+ # fi
fi
fi
