commit 6c8e6ca645585847723be8278a12b4ca8ab72d69
author Kaido Kert <kaidokert@google.com> Fri Apr 02 11:12:53 2021 -0700
committer Kaido Kert <kaidokert@google.com> Fri Apr 02 12:45:59 2021 -0700
tree 89307dd029eb23dc535afbf1cf77ff2d127b93b5
parent 72bde07ae3f88e8fd742a603ece725b122de47f5

Import Cobalt 21.master.0.300525

src/docker/linux/android/Dockerfile

diff --git a/src/docker/linux/android/Dockerfile b/src/docker/linux/android/Dockerfile
index fe82cef..5967e8a 100644
--- a/src/docker/linux/android/Dockerfile
+++ b/src/docker/linux/android/Dockerfile
@@ -18,17 +18,15 @@
 
 RUN mkdir -p /root/.android
 
-CMD (test -f /root/.android/debug.keystore \
-    && echo "Android debug keystore exists." \
-    || (keytool -genkey -v \
-               -keystore /root/.android/debug.keystore \
-               -dname "cn=Android Docker, ou=YouTube, o=Google, c=US" \
-               -storepass android \
-               -alias androiddebugkey \
-               -keypass android \
-               -keyalg RSA \
-               -keysize 2048 \
-               -validity 10000 \
-    && echo "Generated Android Debug keystore.")) \
-    && /code/cobalt/build/gyp_cobalt -v -C ${CONFIG} ${PLATFORM} \
+RUN keytool -genkey -v \
+            -keystore /root/.android/debug.keystore \
+            -dname "cn=Android Docker, ou=YouTube, o=Google, c=US" \
+            -storepass android \
+            -alias androiddebugkey \
+            -keypass android \
+            -keyalg RSA \
+            -keysize 2048 \
+            -validity 10000
+
+CMD /code/cobalt/build/gyp_cobalt -v -C ${CONFIG} ${PLATFORM} \
     && ninja -v -j ${NINJA_PARALLEL} -C ${OUTDIR}/${PLATFORM}_${CONFIG} ${TARGET:-cobalt_deploy}