Fix GitHub cross builds

aws · Jul 6, 2023 · 07e567c · 07e567c
1 parent c81bcd1
commit 07e567c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/tools/android-app/README.md b/tools/android-app/README.md
@@ -116,7 +116,7 @@ An Ubuntu 20.04 development machine with 200GB free disk space should be used.
     && cp -r build/dist/arm64-v8a build/dist/armeabi-v7a tools/android-app/app/src/main/jniLibs \
     && cp THIRD-PARTY-LICENSES tools/android-app/app/src/main/assets \
     && cd tools/android-app \
-    && export ANDROID_HOME=/usr/local/android_sdk ./gradlew assemble
+    && ANDROID_HOME=/usr/local/android_sdk ./gradlew assemble
    ```
 
 ### Shared library interface

diff --git a/tools/install-deps-cross-arm64.sh b/tools/install-deps-cross-arm64.sh
@@ -43,7 +43,7 @@ fi
 sed -i "s/deb http/deb [arch=${ARCH}] http/g" /etc/apt/sources.list
 cp /etc/apt/sources.list /etc/apt/sources.list.d/arm64.list
 sed -i "s/deb \[arch=${ARCH}\] http/deb [arch=arm64] http/g" /etc/apt/sources.list.d/arm64.list
-sed -i "s#archive.ubuntu.com/ubuntu#ports.ubuntu.com/ubuntu-ports#g" /etc/apt/sources.list.d/arm64.list
+sed -i -E "s#(archive|security).ubuntu.com/ubuntu#ports.ubuntu.com/ubuntu-ports#g" /etc/apt/sources.list.d/arm64.list
 dpkg --add-architecture arm64
 apt update
 apt install -y \

diff --git a/tools/install-deps-cross-armhf.sh b/tools/install-deps-cross-armhf.sh
@@ -43,7 +43,7 @@ fi
 sed -i "s/deb http/deb [arch=${ARCH}] http/g" /etc/apt/sources.list
 cp /etc/apt/sources.list /etc/apt/sources.list.d/armhf.list
 sed -i "s/deb \[arch=${ARCH}\] http/deb [arch=armhf] http/g" /etc/apt/sources.list.d/armhf.list
-sed -i "s#archive.ubuntu.com/ubuntu#ports.ubuntu.com/ubuntu-ports#g" /etc/apt/sources.list.d/armhf.list
+sed -i -E "s#(archive|security).ubuntu.com/ubuntu#ports.ubuntu.com/ubuntu-ports#g" /etc/apt/sources.list.d/armhf.list
 dpkg --add-architecture armhf
 apt update
 apt install -y \