From 9408026e97fa1257df6fd9d3473555915d22d30f Mon Sep 17 00:00:00 2001 From: Jonathan Klee Date: Fri, 3 Dec 2021 17:34:13 +0100 Subject: [PATCH 1/2] Only build sdk_addon for x86 devices --- src/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/build.sh b/src/build.sh index b9add0c..8dd89bc 100755 --- a/src/build.sh +++ b/src/build.sh @@ -211,8 +211,8 @@ if [ -n "${BRANCH_NAME}" ] && [ -n "${DEVICE}" ]; then if make systemimage; then build_success=true fi - elif [ "${USE_LUNCH}" = true ]; then - if lunch "${BRUNCH_DEVICE}" && mka && mka sdk_addon ; then + elif [ "${IS_EMULATOR}" = true ]; then + if lunch "${BRUNCH_DEVICE}" && mka sdk_addon ; then build_success=true fi elif brunch "${BRUNCH_DEVICE}"; then -- GitLab From 6e148d57d925343cdacd2d8505558fd96c8a6d96 Mon Sep 17 00:00:00 2001 From: Jonathan Klee Date: Fri, 3 Dec 2021 20:34:22 +0100 Subject: [PATCH 2/2] Add xxd package for x86 pie build --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 28c92dd..7da7cea 100644 --- a/Dockerfile +++ b/Dockerfile @@ -153,7 +153,7 @@ RUN apt-get install -y bc bison bsdmainutils build-essential ccache cgpt clang c lib32ncurses5-dev libncurses5 lib32readline-dev lib32z1-dev libtinfo5 liblz4-tool \ libncurses5-dev libsdl1.2-dev libssl-dev libxml2 \ libxml2-utils lsof lzop maven pngcrush \ - procps python python3 rsync schedtool squashfs-tools software-properties-common wget xdelta3 xsltproc yasm \ + procps python python3 rsync schedtool squashfs-tools software-properties-common wget xdelta3 xsltproc xxd yasm \ zip zlib1g-dev RUN curl https://storage.googleapis.com/git-repo-downloads/repo > /usr/local/bin/repo -- GitLab