From 198ae2e1d23c2b18dc5104f2c19b9aacba5022df Mon Sep 17 00:00:00 2001
From: superzheng <superzheng@tencent.com>
Date: Fri, 12 Nov 2021 16:51:41 +0800
Subject: [PATCH] chore(docker): update `android-release` docker image

---
 .../workflows/build_android_release_image.yml |  2 +-
 docker/android-release/Dockerfile             | 25 ++++++++++++++-----
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build_android_release_image.yml b/.github/workflows/build_android_release_image.yml
index d6628e229..99c5f137b 100644
--- a/.github/workflows/build_android_release_image.yml
+++ b/.github/workflows/build_android_release_image.yml
@@ -18,7 +18,7 @@ on:
 jobs:
   push_to_registry:
     name: Push docker image
-    runs-on: ubuntu-latest
+    runs-on: [self-hosted, linux, trusted]
     steps:
       - name: Check out the repo
         uses: actions/checkout@v2
diff --git a/docker/android-release/Dockerfile b/docker/android-release/Dockerfile
index 7c43ac89e..a8acfc6e1 100644
--- a/docker/android-release/Dockerfile
+++ b/docker/android-release/Dockerfile
@@ -1,12 +1,25 @@
 FROM centos
 
 RUN \
-yum -y install git git-lfs unzip python3 python2 pkg-config bzip2 glibc-devel.i686 libstdc++-devel.i686 ncurses-compat-libs libatomic.so.1 && \
+cd \tmp && \
+yum -y install java-1.8.0-openjdk-devel git git-lfs unzip python3 python2 pkg-config bzip2 glibc-devel.i686 libstdc++-devel.i686 ncurses-compat-libs libatomic.so.1 && \
 yum clean all && \
 ln -fs /usr/bin/python2.7 /usr/bin/python && \
-git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git && \
-curl -O https://dl.google.com/android/repository/android-ndk-r21e-linux-x86_64.zip && \
-unzip android-ndk-r21e-linux-x86_64.zip && \
-rm android-ndk-r21e-linux-x86_64.zip
+git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git /opt/depot_tools && \
+/opt/depot_tools/gclient && \
+curl -O https://downloads.gradle-dn.com/distributions/gradle-7.3-bin.zip && \
+unzip -d /opt gradle-7.3-bin.zip && \
+curl -O https://dl.google.com/android/repository/commandlinetools-linux-7583922_latest.zip && \
+unzip -d /opt commandlinetools-linux-7583922_latest.zip && \
+yes | /opt/cmdline-tools/bin/sdkmanager --sdk_root=/opt/sdk-root --licenses && \
+/opt/cmdline-tools/bin/sdkmanager --sdk_root=/opt/sdk-root --install "ndk;21.4.7075529" "cmake;3.10.2.4988404" "build-tools;30.0.2" "platforms;android-29" && \
+rm -rf /tmp && mkdir /tmp
 
-ENV ANDROID_NDK_HOME=/android-ndk-r21e PATH="/depot_tools:${PATH}"
\ No newline at end of file
+ENV PATH="/opt/gradle-7.3/bin:/opt/depot_tools:${PATH}" JAVA_HOME=/usr/lib/jvm/jre ANDROID_SDK_ROOT=/opt/sdk-root ANDROID_NDK_HOME=/opt/sdk-root/ndk/21.4.7075529/
+
+RUN \
+cd \tmp && \
+git clone https://github.com/Tencent/Hippy --depth 1 -b master && \
+cd Hippy/examples/android-demo && \
+gradle assemblerelease && \
+rm -rf /tmp && mkdir /tmp