Snap for 11241848 from 64729117379313fad548ee8eea6553db0c9a327b to androidx-annotation-annotation-experimental-release
Change-Id: I0ac31b8a96262766d4c45ed4b41a17a5d2a8401e
diff --git a/README.md b/README.md
index 759bc2e..edcaa5f 100644
--- a/README.md
+++ b/README.md
@@ -1,13 +1,10 @@
This folder contains pre-downloaded dependencies for Kotlin
native builds.
-They are downloaded by running `./gradlew updateKonanPrebuilts` in
-`frameworks/support`. If you need to update prebuilts, please
-re-run that task and commit the result.
+They are downloaded by running
+`development/importMaven/importMaven.sh import-konan-binaries --konan-compiler-version <version>`
+in `frameworks/support`. If you need to update prebuilts, please re-run that task and commit
+the result (replace <version> with kotlin version).
This repository is provided to the Kotlin Multiplatform Build as
the remote server where it can find the dependencies.
-
-IMPORTANT: As agreed offline and signed off in b/200289211, we will use
-these downloaded dependencies for CI only, and will replace with verified
-self-built libraries before building anything for release.
diff --git a/copy-linux-sysroot.sh b/copy-linux-sysroot.sh
index dc8585a..a9eb75b 100755
--- a/copy-linux-sysroot.sh
+++ b/copy-linux-sysroot.sh
@@ -11,12 +11,12 @@
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
function usage {
- echo "Error: $1"
+ echo "Error: $1" >&2
echo "Usage: ./copy-linux-sysroot.sh --kotlin-version <kotlin-version> --target-dir <out-libs-dir>
Arguments:
--kotlin-version: The kotlin version to use.
--target-dir: The directory into which the native libraries will be exported.
- "
+ " >&2
exit 1
}
@@ -44,14 +44,14 @@
then
usage "Missing kotlin-version argument"
else
- echo "kotlin version: $KOTLIN_VERSION"
+ echo "kotlin version: $KOTLIN_VERSION" >&2
fi
if [ -z "$SYSROOT_LIBS_TARGET" ]
then
usage "missing target-dir argument"
else
- echo "unzip dir: $SYSROOT_LIBS_TARGET"
+ echo "unzip dir: $SYSROOT_LIBS_TARGET" >&2
fi
# linux-prebuilts.properties includes the mappings from kotlin version to the konan
@@ -62,7 +62,7 @@
usage "Cannot find prebuilts file for $KOTLIN_VERSION"
fi
SYSROOT_PATH="$PREBUILTS_FILE/x86_64-unknown-linux-gnu/sysroot/lib"
-echo "Prebuilts file: $PREBUILTS_FILE"
+echo "Prebuilts file: $PREBUILTS_FILE" >&2
TMP_DIR="$SYSROOT_LIBS_TARGET-extract"
mkdir -p $TMP_DIR
mkdir -p $SYSROOT_LIBS_TARGET
@@ -71,4 +71,4 @@
cp -R $TMP_DIR/$SYSROOT_PATH/* $SYSROOT_LIBS_TARGET/.
rm -rf $TMP_DIR
-echo "Unzipped sysroot libs into ${SYSROOT_LIBS_TARGET}"
\ No newline at end of file
+echo "Unzipped sysroot libs into ${SYSROOT_LIBS_TARGET}" >&2
diff --git a/linux-prebuilts.properties b/linux-prebuilts.properties
index eb62da4..e2f5c29 100644
--- a/linux-prebuilts.properties
+++ b/linux-prebuilts.properties
@@ -1 +1 @@
-1.7.10=x86_64-unknown-linux-gnu-gcc-8.3.0-glibc-2.19-kernel-4.9-2
+1.9.21=x86_64-unknown-linux-gnu-gcc-8.3.0-glibc-2.19-kernel-4.9-2
diff --git a/msys2-mingw-w64-i686-2.tar.gz b/msys2-mingw-w64-i686-2.tar.gz
new file mode 100644
index 0000000..49e5da0
--- /dev/null
+++ b/msys2-mingw-w64-i686-2.tar.gz
Binary files differ
diff --git a/msys2-mingw-w64-x86_64-2.tar.gz b/msys2-mingw-w64-x86_64-2.tar.gz
new file mode 100644
index 0000000..b21f5e8
--- /dev/null
+++ b/msys2-mingw-w64-x86_64-2.tar.gz
Binary files differ
diff --git a/nativeCompilerPrebuilts/releases/1.7.10/linux-x86_64/kotlin-native-prebuilt-linux-x86_64-1.7.10.tar.gz b/nativeCompilerPrebuilts/releases/1.7.10/linux-x86_64/kotlin-native-prebuilt-linux-x86_64-1.7.10.tar.gz
deleted file mode 100644
index 8b782c3..0000000
--- a/nativeCompilerPrebuilts/releases/1.7.10/linux-x86_64/kotlin-native-prebuilt-linux-x86_64-1.7.10.tar.gz
+++ /dev/null
Binary files differ
diff --git a/nativeCompilerPrebuilts/releases/1.7.10/macos-aarch64/kotlin-native-prebuilt-macos-aarch64-1.7.10.tar.gz b/nativeCompilerPrebuilts/releases/1.7.10/macos-aarch64/kotlin-native-prebuilt-macos-aarch64-1.7.10.tar.gz
deleted file mode 100644
index cdfac02..0000000
--- a/nativeCompilerPrebuilts/releases/1.7.10/macos-aarch64/kotlin-native-prebuilt-macos-aarch64-1.7.10.tar.gz
+++ /dev/null
Binary files differ
diff --git a/nativeCompilerPrebuilts/releases/1.7.10/macos-x86_64/kotlin-native-prebuilt-macos-x86_64-1.7.10.tar.gz b/nativeCompilerPrebuilts/releases/1.7.10/macos-x86_64/kotlin-native-prebuilt-macos-x86_64-1.7.10.tar.gz
deleted file mode 100644
index 0810a7a..0000000
--- a/nativeCompilerPrebuilts/releases/1.7.10/macos-x86_64/kotlin-native-prebuilt-macos-x86_64-1.7.10.tar.gz
+++ /dev/null
Binary files differ
diff --git a/nativeCompilerPrebuilts/releases/1.9.21/linux-x86_64/kotlin-native-prebuilt-linux-x86_64-1.9.21.tar.gz b/nativeCompilerPrebuilts/releases/1.9.21/linux-x86_64/kotlin-native-prebuilt-linux-x86_64-1.9.21.tar.gz
new file mode 100644
index 0000000..f904a93
--- /dev/null
+++ b/nativeCompilerPrebuilts/releases/1.9.21/linux-x86_64/kotlin-native-prebuilt-linux-x86_64-1.9.21.tar.gz
Binary files differ
diff --git a/nativeCompilerPrebuilts/releases/1.9.21/macos-aarch64/kotlin-native-prebuilt-macos-aarch64-1.9.21.tar.gz b/nativeCompilerPrebuilts/releases/1.9.21/macos-aarch64/kotlin-native-prebuilt-macos-aarch64-1.9.21.tar.gz
new file mode 100644
index 0000000..ad4806f
--- /dev/null
+++ b/nativeCompilerPrebuilts/releases/1.9.21/macos-aarch64/kotlin-native-prebuilt-macos-aarch64-1.9.21.tar.gz
Binary files differ
diff --git a/nativeCompilerPrebuilts/releases/1.9.21/macos-x86_64/kotlin-native-prebuilt-macos-x86_64-1.9.21.tar.gz b/nativeCompilerPrebuilts/releases/1.9.21/macos-x86_64/kotlin-native-prebuilt-macos-x86_64-1.9.21.tar.gz
new file mode 100644
index 0000000..de38f03
--- /dev/null
+++ b/nativeCompilerPrebuilts/releases/1.9.21/macos-x86_64/kotlin-native-prebuilt-macos-x86_64-1.9.21.tar.gz
Binary files differ
diff --git a/target-sysroot-1-android_ndk.tar.gz b/target-sysroot-1-android_ndk.tar.gz
new file mode 100644
index 0000000..d06c12e
--- /dev/null
+++ b/target-sysroot-1-android_ndk.tar.gz
Binary files differ
diff --git a/target-toolchain-2-linux-android_ndk.tar.gz b/target-toolchain-2-linux-android_ndk.tar.gz
new file mode 100644
index 0000000..cea3aae
--- /dev/null
+++ b/target-toolchain-2-linux-android_ndk.tar.gz
Binary files differ
diff --git a/target-toolchain-2-osx-android_ndk.tar.gz b/target-toolchain-2-osx-android_ndk.tar.gz
new file mode 100644
index 0000000..c88f2c1
--- /dev/null
+++ b/target-toolchain-2-osx-android_ndk.tar.gz
Binary files differ
