update CHANGELOG

CHANGELOG.md

@@ -11,6 +11,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Added validation for `--public-url`.
 
+### Changed
+
+- Changed the way of installing NDK - it's installed with `sdkmanager` now.
+- Upgraded NDK to 17.2.4988734.
+
 ### Fixed
 
 - A bug where the `platform` field in logs wasn't set correctly when using a shortcut command.

Dockerfile

@@ -1,5 +1,5 @@
 # see docker-base/Dockerfile to learn what's installed in the turtle-android-base image
-FROM gcr.io/exponentjs/turtle-android-base:0.1.1
+FROM gcr.io/exponentjs/turtle-android-base:0.1.2
 
 ADD . /app/turtle
 

docker-base/Dockerfile

@@ -55,32 +55,9 @@ ENV PATH ${ANDROID_HOME}/tools:${PATH}
 ENV PATH ${ANDROID_HOME}/tools/bin:${PATH}
 ENV PATH ${ANDROID_HOME}/build-tools/28.0.3/:${PATH}
 
-ADD scripts/android/configureAndroidSdk.sh /tmp/configureAndroidSdk.sh
+ADD configureAndroidSdk.sh /tmp/configureAndroidSdk.sh
 RUN /tmp/configureAndroidSdk.sh --install-all-platforms
 
-# Install Android NDK
-ENV ANDROID_NDK_VERSION android-ndk-r10e
-ENV ANDROID_NDK_FILE ${ANDROID_NDK_VERSION}-linux-x86_64.bin
-ENV ANDROID_NDK_URL https://dl.google.com/android/ndk/${ANDROID_NDK_FILE}
-ENV ANDROID_NDK /opt/${ANDROID_NDK_VERSION}
-ENV PATH $ANDROID_NDK:$PATH
-
-# i have no clue why some of this is here, but it's working elsewhere
-# it appears to install the NDK version expo needs, so that's cool
-RUN mkdir /ndk_setup && cd /ndk_setup && \
-  curl -L ${ANDROID_NDK_URL} > ${ANDROID_NDK_FILE} && \
-  chmod +x ${ANDROID_NDK_FILE} && \
-  sync && \
-  ./${ANDROID_NDK_FILE} && \
-  mv ./${ANDROID_NDK_VERSION} ${ANDROID_NDK} && \
-  cp -R \
-  ${ANDROID_NDK}/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86_64 \
-  ${ANDROID_NDK}/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86 && \
-  cp -R \
-  ${ANDROID_NDK}/toolchains/x86-4.8/prebuilt/linux-x86_64 \
-  ${ANDROID_NDK}/toolchains/x86-4.8/prebuilt/linux-x86 && \
-  cd && rm -rf /ndk_setup
-
 # Support Gradle
 ENV TERM dumb
 

scripts/android/buildAndPushAndroidBaseImage.sh

@@ -3,6 +3,8 @@
 set -eo pipefail
 
 ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/../.. && pwd )"
+CONFIGURE_ANDROID_SDK_PATH="$ROOT_DIR/scripts/android/configureAndroidSdk.sh"
+DOCKER_BASE_DIR="$ROOT_DIR/docker-base"
 
 IMAGE_TAG="$1"
 if [[ -z "$IMAGE_TAG" ]]; then
@@ -13,10 +15,12 @@ fi
 IMAGE_VERSION_FULL_NAME="gcr.io/exponentjs/turtle-android-base:$IMAGE_TAG"
 IMAGE_LATEST_FULL_NAME="gcr.io/exponentjs/turtle-android-base:latest"
 
-pushd $ROOT_DIR > /dev/null
-docker build -f docker-base/Dockerfile -t "$IMAGE_VERSION_FULL_NAME" -t "$IMAGE_LATEST_FULL_NAME" .
+pushd $DOCKER_BASE_DIR > /dev/null
+cp $CONFIGURE_ANDROID_SDK_PATH .
+docker build -t "$IMAGE_VERSION_FULL_NAME" -t "$IMAGE_LATEST_FULL_NAME" .
 echo "Successfully built $IMAGE_VERSION_FULL_NAME Docker image"
 gcloud docker -- push "$IMAGE_VERSION_FULL_NAME"
 gcloud docker -- push "$IMAGE_LATEST_FULL_NAME"
 echo "Successfully pushed $IMAGE_VERSION_FULL_NAME Docker image to GCloud"
+rm -rf `basename $CONFIGURE_ANDROID_SDK_PATH`
 popd  > /dev/null

scripts/android/configureAndroidSdk.sh

@@ -18,3 +18,5 @@ yes | $SDKMANAGER \
   "extras;android;m2repository" \
   "extras;google;m2repository" \
   "extras;google;google_play_services" | grep -v '='; [[ ${PIPESTATUS[1]} = 0 ]]
+
+yes | $SDKMANAGER "ndk;17.2.4988734" | grep -v '='; [[ ${PIPESTATUS[1]} = 0 ]]

src/bin/setup/android/index.ts

@@ -5,7 +5,6 @@ import { ExponentTools } from '@expo/xdl';
 import fs from 'fs-extra';
 import _which from 'which';
 
-import ensureAndroidNDKIsPresent from 'turtle/bin/setup/android/ndk';
 import ensureAndroidSDKIsPresent from 'turtle/bin/setup/android/sdk';
 import { checkSystem, ensureShellAppIsPresent } from 'turtle/bin/setup/utils/common';
 import { IToolDefinition } from 'turtle/bin/setup/utils/toolsDetector';
@@ -66,9 +65,8 @@ export default async function setup(sdkVersion?: string) {
 async function prepareAndroidEnv() {
   await fs.ensureDir(config.directories.androidDependenciesDir);
   const sdkConfig = await ensureAndroidSDKIsPresent();
-  const ndkConfig = await ensureAndroidNDKIsPresent();
-  _setEnvVars({ ...sdkConfig.envVars, ...ndkConfig.envVars });
-  _alterPath([...sdkConfig.path, ...sdkConfig.path]);
+  _setEnvVars(sdkConfig.envVars);
+  _alterPath(sdkConfig.path);
 }
 
 function formatShellAppTarballUriPath(sdkMajorVersion: string) {

src/bin/setup/android/ndk.ts

@@ -1,53 +0,0 @@
-import os from 'os';
-import path from 'path';
-
-import decompress from 'decompress';
-import fs from 'fs-extra';
-
-import * as utils from 'turtle/bin/setup/utils/common';
-import download from 'turtle/bin/setup/utils/downloader';
-import config from 'turtle/config';
-import logger from 'turtle/logger';
-
-const ANDROID_NDK_URL = `https://dl.google.com/android/repository/android-ndk-r10e-${os.platform()}-x86_64.zip`;
-
-const LOGGER_FIELDS = { buildPhase: 'setting up environment' };
-const l = logger.child(LOGGER_FIELDS);
-
-export default async function ensureAndroidNDKIsPresent() {
-  const androidNdkDir = path.join(config.directories.androidDependenciesDir, 'ndk');
-  await utils.removeDirectoryUnlessReady(androidNdkDir);
-  if (!(await fs.pathExists(androidNdkDir))) {
-    await fs.ensureDir(androidNdkDir);
-    const androidNdkDownloadPath = utils.formatArtifactDownloadPath(ANDROID_NDK_URL);
-
-    try {
-      l.info('Downloading Android NDK');
-      await fs.ensureDir(config.directories.artifactsDir);
-      await download(ANDROID_NDK_URL, androidNdkDownloadPath);
-      l.info('Decompressing Android NDK');
-      await decompress(androidNdkDownloadPath, androidNdkDir, { strip: 1 });
-      await utils.markDirectoryAsReady(androidNdkDir);
-      l.info('Android NDK installed successfully');
-    } catch (err) {
-      await fs.remove(androidNdkDir);
-      throw err;
-    } finally {
-      await fs.remove(androidNdkDownloadPath);
-    }
-  }
-  return {
-    envVars: _createEnvVars(androidNdkDir),
-    path: _createPaths(androidNdkDir),
-  };
-}
-
-function _createEnvVars(androidNdkDir: string) {
-  return {
-    ANDROID_NDK: androidNdkDir,
-  };
-}
-
-function _createPaths(androidNdkDir: string) {
-  return [androidNdkDir];
-}