export MAKE_SKIA_FILE from all top-level scripts that build Skia Diffs= de4fe4d71 export MAKE_SKIA_FILE from all top-level scripts that build Skia
diff --git a/.rive_head b/.rive_head index ca68571..100b2c9 100644 --- a/.rive_head +++ b/.rive_head
@@ -1 +1 @@ -75a6b74b86fff27165430a4bce8ec3ca09a1c69b +de4fe4d71a1eeef8e135991ca395c3159b42dc0d
diff --git a/skia/dependencies/cache_helper.sh b/skia/dependencies/cache_helper.sh index 6940bfb..6688f54 100755 --- a/skia/dependencies/cache_helper.sh +++ b/skia/dependencies/cache_helper.sh
@@ -10,7 +10,6 @@ COMPILE_TARGET="${COMPILE_TARGET:-$(uname -s)_$(uname -m)}" CACHE_NAME="${CACHE_NAME:=skia}" OUTPUT_CACHE="${OUTPUT_CACHE:=out}" -MAKE_SKIA_FILE="${MAKE_SKIA_FILE:=make_skia_android.sh}" ARCHIVE_CONTENTS_NAME="${ARCHIVE_CONTENTS_NAME:=archive_contents}" # lets just make sure this exists, or fail @@ -98,4 +97,4 @@ else return 1 fi -} \ No newline at end of file +}
diff --git a/skia/dependencies/make_skia.sh b/skia/dependencies/make_skia.sh index 05891ee..850878c 100755 --- a/skia/dependencies/make_skia.sh +++ b/skia/dependencies/make_skia.sh
@@ -2,7 +2,7 @@ set -e -export MAKE_SKIA_FILE=make_skia.sh +export MAKE_SKIA_FILE="$0" ./get_skia.sh # use Rive optimized/stripped Skia for iOS static libs.
diff --git a/skia/dependencies/make_skia_android.sh b/skia/dependencies/make_skia_android.sh index 05e637e..e3f5e68 100755 --- a/skia/dependencies/make_skia_android.sh +++ b/skia/dependencies/make_skia_android.sh
@@ -2,6 +2,7 @@ set -ex +export MAKE_SKIA_FILE="$0" source ./get_skia2.sh source ./cache_helper.sh
diff --git a/skia/dependencies/make_skia_ios.sh b/skia/dependencies/make_skia_ios.sh index 7ad7577..91a9d78 100755 --- a/skia/dependencies/make_skia_ios.sh +++ b/skia/dependencies/make_skia_ios.sh
@@ -2,6 +2,7 @@ set -ex +export MAKE_SKIA_FILE="$0" source ./get_skia2.sh source ./cache_helper.sh
diff --git a/skia/dependencies/make_skia_recorder.sh b/skia/dependencies/make_skia_recorder.sh index 22c036e..ef9cb5a 100755 --- a/skia/dependencies/make_skia_recorder.sh +++ b/skia/dependencies/make_skia_recorder.sh
@@ -1,7 +1,7 @@ #!/bin/bash set -ex -export MAKE_SKIA_FILE=make_skia_recorder.sh +export MAKE_SKIA_FILE="$0" source ./get_skia2.sh source ./cache_helper.sh