Skip to content

Commit

Permalink
fix: apk analyzer, fix cmdline-tools path #21 (#24)
Browse files Browse the repository at this point in the history
  • Loading branch information
warnyul authored Apr 23, 2024
1 parent 6571212 commit a44eba9
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 5 deletions.
15 changes: 12 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ ENV ANDROID_SDK_URL https://dl.google.com/android/repository/${ANDROID_SDK_FILE_
ENV ANDROID_HOME /opt/android-sdk-linux
ENV ANDROID_SDK ${ANDROID_HOME}
ENV ANDROID_BUILD_TOOLS ${ANDROID_HOME}/build-tools/${ANDROID_BUILD_TOOLS_VERSION}
ENV PATH ${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools:${ANDROID_BUILD_TOOLS}:${ANDROID_HOME}/cmdline-tools/bin
ENV PATH ${PATH}:${ANDROID_HOME}/platform-tools:${ANDROID_BUILD_TOOLS}:${ANDROID_HOME}/cmdline-tools/latest/bin

# Install requirements
RUN dpkg --add-architecture i386 && \
Expand All @@ -25,12 +25,21 @@ RUN mkdir -p ${ANDROID_HOME} && \
wget -q ${ANDROID_SDK_URL} && \
unzip ${ANDROID_SDK_FILE_NAME} && \
rm ${ANDROID_SDK_FILE_NAME}


# Fix cmdline-tools location
# https://stackoverflow.com/questions/60925741/cant-execute-apkanalyzer
# https://stackoverflow.com/questions/65262340/cmdline-tools-could-not-determine-sdk-root
RUN mkdir -p ${ANDROID_HOME}/latest && \
mv ${ANDROID_HOME}/cmdline-tools/* ${ANDROID_HOME}/latest && \
mv ${ANDROID_HOME}/latest ${ANDROID_HOME}/cmdline-tools

# Install Android SDK
RUN yes | sdkmanager --sdk_root=${ANDROID_HOME} "tools" "platforms;android-${ANDROID_PLATFORM_VERSION}" "build-tools;${ANDROID_BUILD_TOOLS_VERSION}"

# Clean
RUN apt-get -y remove wget unzip && \
apt-get -y autoremove && \
apt-get clean && \
rm -rf /var/lib/apt/lists/*
rm -rf /var/lib/apt/lists/* && \
unset ANDROID_SDK_FILE_NAME && \
unset ANDROID_SDK_URL
4 changes: 2 additions & 2 deletions generateBuildMatrix.sh
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ function generateBuildMatrix() {
}

if [ -z $GITHUB_OUTPUT ]; then
generateBuildMatrix
generateBuildMatrix $@
else
echo "BUILD_MATRIX=$(generateBuildMatrix)" >> "$GITHUB_OUTPUT"
echo "BUILD_MATRIX=$(generateBuildMatrix $@)" >> "$GITHUB_OUTPUT"
fi

0 comments on commit a44eba9

Please sign in to comment.