rename old minor releasesHEADmain

13 files changed, 6 insertions, 302 deletions

diff --git a/build.sh b/build.sh
index b5e039d..51e5d28 100755
--- a/build.sh
+++ b/build.sh
@@ -4,6 +4,9 @@
 # Create a list of all files that start with sdk
 sdk_files=($(find . -type d -name 'sdk*'))
 
+# Create the artifacts directory
+mkdir -p artifacts
+
 # Loop through each SDK folder
 for d in $sdk_files; do
 	# CD into the SDK folder
@@ -16,8 +19,6 @@ for d in $sdk_files; do
 	# Run the dependencies and download scripts
 
 	./download.sh
-	# Create the artifacts directory
-	mkdir -p artifacts
 
 	# If patch.sh exists, run it
 	if [ -f patch.sh ]; then
diff --git a/old-sdk-12.0.0_r19/README.md b/old-sdk-12.0.0_r19/README.md
deleted file mode 100644
index cf6dd8e..0000000
--- a/old-sdk-12.0.0_r19/README.md
+++ /dev/null
@@ -1,42 +0,0 @@
-VERSION='12.0.0_r19'
-====================
-
-Notes
------
-
-- patch.sh is necessary to fix outdated syntax in a py script file. Without that, the build will break at the very end.
-- simultaneous builds of Windows and linux sdk may fail. Default is linux only. If desired, edit build.sh and change the settings.
-
-All commands need to be executed from the sdk folder!
-
-Build receipe
--------------
-
-Make all the .sh scripts in this directory executable:
-
-    chmod +x *.sh
-
-Install dependencies (you will be asked for root password to install packages):
-
-    ./dependencies.sh
-
-Download the source code:
-
-    ./download.sh
-
-Apply patches to the source tree to make the build work:
-
-    ./patch.sh
-
-Compile the sdk:
-
-    ./build.sh
-
-When the build finishes sucessfully, you get a list of the important generated sdk files.
-
-Have fun!
-
-Footnote
---------
-
-Microsoft Windows is a trademark of the Microsoft group of companies. Android is a trademark of Google LLC.
diff --git a/old-sdk-12.0.0_r19/build.sh b/old-sdk-12.0.0_r19/build.sh
deleted file mode 100755
index 5a370e7..0000000
--- a/old-sdk-12.0.0_r19/build.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-
-# Caution: VERSION needs to be identical in all scripts in this directory,
-# otherwise the build will not work.
-VERSION='12.0.0_r19'
-BUILD_VARIANT='eng'
-export USER=$(whoami)
-export BUILD_NUMBER="${BUILD_VARIANT}.${VERSION}"
-. build/envsetup.sh
-lunch sdk-${BUILD_VARIANT}
-make -j$(nproc) sdk dist sdk_repo
-# make -j$(nproc) win_sdk dist sdk_repo
-
-# list the result files
-# ---------------------
-#
-# optional, the windows sdk, disabled by default (see above)
-# ls -lah /out/dist/android-sdk_${BUILD_NUMBER}_windows.zip
-
-# the sdk
-
-ls -lah out/dist/android-sdk_${BUILD_NUMBER}_linux-x86.zip
-
-# the parts of the sdk
-
-ls -lah out/dist/sdk-repo*.zip
-ls -lah out/dist/sdk-symbols-${BUILD_NUMBER}.zip
-ls -lah out/dist/repo*.xml
-
-mkdir ../artifacts/${VERSION}
-mv out/dist ../artifacts/${VERSION}/
-
-echo "Moved SDK to artifact folder"
diff --git a/old-sdk-12.0.0_r19/dependencies.sh b/old-sdk-12.0.0_r19/dependencies.sh
deleted file mode 100755
index 2d2d1d8..0000000
--- a/old-sdk-12.0.0_r19/dependencies.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-
-# Installs necessary packages. Some of them might be obsolete for new builds.
-#
-
-# Notes:
-# - the master branch of AOSP comes with a brebuilt version of OpenJDK, so
-#   no need to install it with apt.
-#
-# Notes about the repo tool:
-#
-# - The repo tool is available from debian repos. Although you may get warned
-#   that a new version of repo is available when starting sync later, this 
-#   usually can be safely ignored.
-# 
-# - should you really need the latest repo version of if your distro does
-#   not have it, you can get the repo tool from here:
-#   https://android.googlesource.com/tools/repo
-#   It is a single script filem, no compiling is necessary. 
-#
-# - repo needs the python-is-python3 symlink package installed to work or a
-#   manual symlink that 'python' is 'python3'. Without it, repo will not
-#   work!
-
-sudo apt install git gnupg flex bison gperf build-essential zip curl \
-zlib1g-dev gcc-multilib g++-multilib libc6-dev-i386 libncurses5-dev \
-libncurses5 libx11-dev lib32z1-dev libgl1-mesa-dev \
-libxml2-utils xsltproc unzip rsync python3 python-is-python3 tofrodos repo
diff --git a/old-sdk-12.0.0_r19/download.sh b/old-sdk-12.0.0_r19/download.sh
deleted file mode 100755
index 422d3fb..0000000
--- a/old-sdk-12.0.0_r19/download.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-# You can go to https://android.googlesource.com/platform/manifest/+refs and
-# to check for the latest version/revision.
-#
-# Usually, different revisions (e.g._r19) work more or less out of the box
-# without the need to change the build skripts.
-#
-# Caution: VERSION needs to be identical in all scripts in this directory,
-# otherwise the build will not work.
-
-VERSION='12.0.0_r19'
-repo init -u https://android.googlesource.com/platform/manifest -b android-$VERSION --depth=1 --color=auto
-repo sync --current-branch -j4
diff --git a/old-sdk-12.0.0_r19/patch.sh b/old-sdk-12.0.0_r19/patch.sh
deleted file mode 100755
index d16b2d5..0000000
--- a/old-sdk-12.0.0_r19/patch.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-# need to patch a py script using outdated syntax not compatible with python3
-
-if [ ! -f "development/build/tools/mk_sources_zip.py.bak" ]; then
-    cp development/build/tools/mk_sources_zip.py development/build/tools/mk_sources_zip.py.bak
-fi
-
-sed -i '77 s/"""/    print/' development/build/tools/mk_sources_zip.py
-sed -i '94 s/except /except (/' development/build/tools/mk_sources_zip.py
-sed -i '94 s/:/):/' development/build/tools/mk_sources_zip.py
-
-sed -i '250 c\# removed' development/build/tools/mk_sources_zip.py
-sed -i '251 c\# removed' development/build/tools/mk_sources_zip.py
-sed -i '252 c\# removed' development/build/tools/mk_sources_zip.py
-sed -i '253 c\# removed' development/build/tools/mk_sources_zip.py
-sed -i '254 c\# removed' development/build/tools/mk_sources_zip.py
-
-sed -i '62 c\# removed' development/build/tools/mk_sources_zip.py
-sed -i '63 c\# removed' development/build/tools/mk_sources_zip.py
-sed -i '64 c\# removed' development/build/tools/mk_sources_zip.py
-sed -i '65 c\# removed' development/build/tools/mk_sources_zip.py
-sed -i '66 c\# removed' development/build/tools/mk_sources_zip.py
-sed -i '67 c\# removed' development/build/tools/mk_sources_zip.py
-sed -i '68 c\# removed' development/build/tools/mk_sources_zip.py
-sed -i '69 c\# removed' development/build/tools/mk_sources_zip.py
-sed -i '70 c\# removed' development/build/tools/mk_sources_zip.py
-sed -i '71 c\# removed' development/build/tools/mk_sources_zip.py
-sed -i '72 c\# removed' development/build/tools/mk_sources_zip.py
-sed -i '73 c\# removed' development/build/tools/mk_sources_zip.py
-sed -i '74 c\# removed' development/build/tools/mk_sources_zip.py
-sed -i '75 c\# removed' development/build/tools/mk_sources_zip.py
-sed -i '76 c\# removed' development/build/tools/mk_sources_zip.py
-
-
diff --git a/old-sdk-13.0.0_r10/README.md b/old-sdk-13.0.0_r10/README.md
deleted file mode 100644
index 63d3356..0000000
--- a/old-sdk-13.0.0_r10/README.md
+++ /dev/null
@@ -1,65 +0,0 @@
-VERSION='13.0.0_r10'
-====================
-
-IMPORTANT
----------
-The Android(tm) 13 sdk (api level 33), contrary to previous versions, does NOT include
-a system image anymore. 
-
-You will notice a significantly reduced source tree, a smaller output sdk-zip-file 
-and will experience a much shorter build time. This is, because the build receipe
-does not generate a system image.
-
-This is ok, because you do not really need it (unless you use a VM instead of a 
-real device) for development.
-
-But do not worry, you still can build it! But not from the sdk source tree!
-
-Simply follow the instructions here to create a system image:
-https://source.android.com/docs/setup/create/gsi#building-gsis
-
-You need to pull a different source tree.
-
-For the most up-to-date Android 13, the branch to use is "android13-gsi".
-
-I have tested building it with the same build environent like for the sdk, and
-it works without any issues!
-
-
-Notes
------
-
-- simultaneous builds of Windows and linux sdk may fail. Default is linux only. If desired, edit build.sh and change the settings.
-- the build.sh differs significantly to previous versions, because building 
-conscrypt will run in multiple issues and result in (unrecoverable) errors unless 
-some additional modules are built from source.
-
-All commands need to be executed from the sdk folder!
-
-Build receipe
--------------
-
-Make all the .sh scripts in this directory executable:
-
-    chmod +x *.sh
-
-Install dependencies (you will be asked for root password to install packages):
-
-    ./dependencies.sh
-
-Download the source code:
-
-    ./download.sh
-
-Compile the sdk:
-
-    ./build.sh
-
-When the build finishes sucessfully, you get a list of the important generated sdk files.
-
-Have fun!
-
-Footnote
---------
-
-Microsoft Windows is a trademark of the Microsoft group of companies. Android is a trademark of Google LLC.
diff --git a/old-sdk-13.0.0_r10/build.sh b/old-sdk-13.0.0_r10/build.sh
deleted file mode 100644
index d2779cf..0000000
--- a/old-sdk-13.0.0_r10/build.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-# Caution: VERSION needs to be identical in all scripts in this directory,
-# otherwise the build will not work.
-VERSION='13.0.0_r10'
-BUILD_VARIANT='eng'
-export USER=$(whoami)
-export BUILD_NUMBER="${BUILD_VARIANT}.${VERSION}"
-# needed, because otherwise conscrypt build will fail. ART and some other
-# dependencies need to be built from source.
-export ART_MODULE_BUILD_FROM_SOURCE=true
-export MODULE_BUILD_FROM_SOURCE=true
-
-. build/envsetup.sh
-lunch sdk-${BUILD_VARIANT}
-make -j$(nproc) sdk dist sdk_repo
-# make -j$(nproc) win_sdk dist sdk_repo
-
-# list the result files
-# ---------------------
-#
-# optional, the windows sdk, disabled by default (see above)
-# ls -lah /out/dist/android-sdk_${BUILD_NUMBER}_windows.zip
-
-# the sdk
-
-ls -lah out/dist/android-sdk_${BUILD_NUMBER}_linux-x86.zip
-
-# the parts of the sdk
-
-ls -lah out/dist/sdk-repo*.zip
-ls -lah out/dist/sdk-symbols-${BUILD_NUMBER}.zip
-ls -lah out/dist/repo*.xml
-
-mkdir ../artifacts/${VERSION}
-mv out/dist ../artifacts/${VERSION}/
-
-echo "Moved SDK to artifact folder"
diff --git a/old-sdk-13.0.0_r10/dependencies.sh b/old-sdk-13.0.0_r10/dependencies.sh
deleted file mode 100644
index 2d2d1d8..0000000
--- a/old-sdk-13.0.0_r10/dependencies.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-
-# Installs necessary packages. Some of them might be obsolete for new builds.
-#
-
-# Notes:
-# - the master branch of AOSP comes with a brebuilt version of OpenJDK, so
-#   no need to install it with apt.
-#
-# Notes about the repo tool:
-#
-# - The repo tool is available from debian repos. Although you may get warned
-#   that a new version of repo is available when starting sync later, this 
-#   usually can be safely ignored.
-# 
-# - should you really need the latest repo version of if your distro does
-#   not have it, you can get the repo tool from here:
-#   https://android.googlesource.com/tools/repo
-#   It is a single script filem, no compiling is necessary. 
-#
-# - repo needs the python-is-python3 symlink package installed to work or a
-#   manual symlink that 'python' is 'python3'. Without it, repo will not
-#   work!
-
-sudo apt install git gnupg flex bison gperf build-essential zip curl \
-zlib1g-dev gcc-multilib g++-multilib libc6-dev-i386 libncurses5-dev \
-libncurses5 libx11-dev lib32z1-dev libgl1-mesa-dev \
-libxml2-utils xsltproc unzip rsync python3 python-is-python3 tofrodos repo
diff --git a/old-sdk-13.0.0_r10/download.sh b/old-sdk-13.0.0_r10/download.sh
deleted file mode 100644
index a49a8d9..0000000
--- a/old-sdk-13.0.0_r10/download.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-# You can go to https://android.googlesource.com/platform/manifest/+refs and
-# to check for the latest version/revision.
-#
-# Usually, different revisions (e.g._r19) work more or less out of the box
-# without the need to change the build skripts.
-#
-# Caution: VERSION needs to be identical in all scripts in this directory,
-# otherwise the build will not work.
-
-VERSION='13.0.0_r10'
-repo init -u https://android.googlesource.com/platform/manifest -b android-$VERSION --depth=1 --color=auto
-repo sync --current-branch -j4
diff --git a/sdk-12.1.0_r27/build.sh b/sdk-12.1.0_r27/build.sh
index b3a1960..b3a1960 100644..100755
--- a/sdk-12.1.0_r27/build.sh
+++ b/sdk-12.1.0_r27/build.sh
diff --git a/sdk-12.1.0_r27/dependencies.sh b/sdk-12.1.0_r27/dependencies.sh
index 2d2d1d8..2d2d1d8 100644..100755
--- a/sdk-12.1.0_r27/dependencies.sh
+++ b/sdk-12.1.0_r27/dependencies.sh
diff --git a/sdk-12.1.0_r27/download.sh b/sdk-12.1.0_r27/download.sh
index 44264d0..214300f 100644..100755
--- a/sdk-12.1.0_r27/download.sh
+++ b/sdk-12.1.0_r27/download.sh
@@ -4,11 +4,11 @@
 # to check for the latest version/revision.
 #
 # Usually, different revisions (e.g._r19) work more or less out of the box
-# without the need to change the build skripts. 
+# without the need to change the build skripts.
 #
-# Caution: VERSION needs to be identical in all scripts in this directory, 
+# Caution: VERSION needs to be identical in all scripts in this directory,
 # otherwise the build will not work.
 
 VERSION='12.1.0_r27'
-repo init -u https://android.googlesource.com/platform/manifest -b android-$VERSION --depth=1
+repo init -u https://android.googlesource.com/platform/manifest -b android-$VERSION --depth=1 --color=auto
 repo sync --current-branch -j4