Android NDK r23

Author: wchen342

Diff for: base/docker-setup.sh

@@ -19,6 +19,9 @@ apt -y install git gnupg flex bison build-essential zip \
     libgl1-mesa-dev libxml2-utils xsltproc unzip fontconfig tofrodos \
     rsync dos2unix pbzip2
 
+# For NDK
+apt -y install  python3-pip python3-apt texinfo
+
 # Set up user and working directory
 useradd build -m -s /bin/bash
 mkdir -p /home/build/wd

Diff for: ndk/build.sh

@@ -4,7 +4,7 @@ set -eu -o pipefail
 pushd ../base && source ./setup.sh && popd
 
 container_name="android-rebuilds-ndk"
-VERSION='ndk-release-r23'
+VERSION='r23'
 
 docker create --name ${container_name} --workdir /home/build/wd --entrypoint "tail" android-rebuilds:base "-f" "/dev/null"
 docker start "${container_name}"
@@ -14,13 +14,15 @@ docker cp docker-build.sh "${container_name}":/home/build/wd/docker-build.sh
 docker exec --user build "${container_name}" bash -c "/home/build/wd/docker-build.sh"
 
 # copy output
+docker cp "${container_name}":/home/build/wd/out/dist/android-ndk-0-linux-x86_64.zip android-ndk-${VERSION}-linux-x86_64.zip
+docker cp "${container_name}":/home/build/wd/out/dist/android-ndk-0-windows-x86_64.zip android-ndk-${VERSION}-windows-x86_64.zip
 
 # shutdown and remove container
-# if docker ps --format '{{.Names}}' | grep -w "${container_name}" &> /dev/null; then
-#   echo "Stopping container"
-#   docker stop "${container_name}"
-# fi
-# if docker ps --all --format '{{.Names}}' | grep -w "${container_name}" &> /dev/null; then
-#   echo "Removing container"
-#   docker rm "${container_name}"
-# fi
+if docker ps --format '{{.Names}}' | grep -w "${container_name}" &> /dev/null; then
+  echo "Stopping container"
+  docker stop "${container_name}"
+fi
+if docker ps --all --format '{{.Names}}' | grep -w "${container_name}" &> /dev/null; then
+  echo "Removing container"
+  docker rm "${container_name}"
+fi

Diff for: ndk/docker-build.sh

@@ -2,28 +2,18 @@
 set -eux -o pipefail
 
 VERSION='r23'    # temporarily before SDK 12 comes out formally
-# https://source.android.com/setup/build/building#choose-a-target
-TARGET='eng'    # user, userdebug, eng
 
 export USER=$(whoami)
-export BUILD_NUMBER="${TARGET}-${VERSION}"
 
 # Sync sources
 repo init -u https://android.googlesource.com/platform/manifest -b ndk-$VERSION --depth=1
 repo sync -c -j4
 
-# Various fixes
-# Clone missing libraries
-
-# Clean up and fixes
+# Fixes
+# Remove bundled python
+mv prebuilts/python3 prebuilts/python3-bak
 
 # Build
-# build/envsetup.sh cannot be run with -u
-set +u
-source build/envsetup.sh
-lunch ndk_arm64-${TARGET}
-set -u
-
-# win_sdk build linux SDK too
-#make -j$(nproc) sdk dist sdk_repo
-make -j$(nproc) win_sdk dist sdk_repo
+cd ndk
+python checkbuild.py --no-build-tests --package --system linux
+python checkbuild.py --no-build-tests --package --system windows64