From 39404c4a852030a59641f9a3c58eb4d35f3ce5c7 Mon Sep 17 00:00:00 2001
From: ppoffice <ppoffice@users.noreply.github.com>
Date: Wed, 7 Oct 2020 21:59:07 -0400
Subject: [PATCH] optimize env and dockerfile

---
 Dockerfile           | 47 +++++++++++++++-----------------------------
 tools/android-env.sh |  7 ++++++-
 2 files changed, 22 insertions(+), 32 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 0541c7a..83ea871 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,36 +1,27 @@
 FROM ubuntu:18.04
 
-ENV ANDROID_SDK_HOME /opt/android-sdk-linux
-ENV ANDROID_SDK_ROOT /opt/android-sdk-linux
-ENV ANDROID_HOME /opt/android-sdk-linux
-ENV ANDROID_SDK /opt/android-sdk-linux
-
-ENV PATH "${PATH}:${ANDROID_HOME}/platform-tools:${ANDROID_HOME}/cmdline-tools/tools/bin:${ANDROID_HOME}/emulator:${ANDROID_HOME}/bin"
-
 ENV DEBIAN_FRONTEND noninteractive
 
-# Install required tools
-# Dependencies to execute Android builds
+ENV ANDROID_HOME      /opt/android-sdk-linux
+ENV ANDROID_SDK_HOME  ${ANDROID_HOME}
+ENV ANDROID_SDK_ROOT  ${ANDROID_HOME}
+ENV ANDROID_SDK       ${ANDROID_HOME}
 
-RUN dpkg --add-architecture i386 && apt-get update -yqq && apt-get install -y \
-  curl \
-  expect \
-  git \
-  libc6:i386 \
-  libgcc1:i386 \
-  libncurses5:i386 \
-  libstdc++6:i386 \
-  zlib1g:i386 \
-  openjdk-8-jdk \
-  wget \
-  unzip \
-  vim \
-  && apt-get clean
+ENV PATH "${PATH}:${ANDROID_HOME}/cmdline-tools/latest/bin"
+ENV PATH "${PATH}:${ANDROID_HOME}/cmdline-tools/tools/bin"
+ENV PATH "${PATH}:${ANDROID_HOME}/tools/bin"
+ENV PATH "${PATH}:${ANDROID_HOME}/platform-tools"
+ENV PATH "${PATH}:${ANDROID_HOME}/emulator"
+ENV PATH "${PATH}:${ANDROID_HOME}/bin"
+
+RUN dpkg --add-architecture i386 && \
+    apt-get update -yqq && \
+    apt-get install -y curl expect git libc6:i386 libgcc1:i386 libncurses5:i386 libstdc++6:i386 zlib1g:i386 openjdk-8-jdk wget unzip vim && \
+    apt-get clean
 
 RUN groupadd android && useradd -d /opt/android-sdk-linux -g android android
 
 COPY tools /opt/tools
-
 COPY licenses /opt/licenses
 
 WORKDIR /opt/android-sdk-linux
@@ -38,15 +29,9 @@ WORKDIR /opt/android-sdk-linux
 RUN /opt/tools/entrypoint.sh built-in
 
 RUN /opt/android-sdk-linux/cmdline-tools/tools/bin/sdkmanager "cmdline-tools;latest"
-
 RUN /opt/android-sdk-linux/cmdline-tools/tools/bin/sdkmanager "build-tools;30.0.2"
-
-RUN /opt/android-sdk-linux/cmdline-tools/tools/bin/sdkmanager "platforms;android-30"
-
 RUN /opt/android-sdk-linux/cmdline-tools/tools/bin/sdkmanager "platform-tools"
-
-RUN /opt/android-sdk-linux/cmdline-tools/tools/bin/sdkmanager "emulator"
-
+RUN /opt/android-sdk-linux/cmdline-tools/tools/bin/sdkmanager "platforms;android-30"
 RUN /opt/android-sdk-linux/cmdline-tools/tools/bin/sdkmanager "system-images;android-30;google_apis;x86_64"
 
 CMD /opt/tools/entrypoint.sh built-in
diff --git a/tools/android-env.sh b/tools/android-env.sh
index 160aba6..ad48188 100644
--- a/tools/android-env.sh
+++ b/tools/android-env.sh
@@ -5,7 +5,12 @@ export ANDROID_SDK_ROOT=${ANDROID_HOME}
 export ANDROID_SDK_HOME=${ANDROID_HOME}
 export ANDROID_SDK=${ANDROID_HOME}
 
-export PATH=${PATH}:${ANDROID_HOME}/cmdline-tools/tools/bin:${ANDROID_HOME}/platform-tools:${ANDROID_HOME}/emulator:${ANDROID_HOME}/bin:
+export PATH=${PATH}:${ANDROID_HOME}/cmdline-tools/latest/bin
+export PATH=${PATH}:${ANDROID_HOME}/cmdline-tools/tools/bin
+export PATH=${PATH}:${ANDROID_HOME}/tools/bin
+export PATH=${PATH}:${ANDROID_HOME}/platform-tools
+export PATH=${PATH}:${ANDROID_HOME}/emulator
+export PATH=${PATH}:${ANDROID_HOME}/bin
 
 function print_header() {
     figlet SBB CFF FFS