Use NDK 24 to build nkdports. am: 59be24cefa am: 2e6f01c80d
Original change: https://android-review.googlesource.com/c/platform/tools/ndkports/+/2128154
Change-Id: Ib12cfc65b07cad44b54434e1bdacfa714ae560c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/Dockerfile b/Dockerfile
index ac011ef..d13dde9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,9 +7,9 @@
python3-pip
RUN pip3 install meson
RUN curl -o ndk.zip \
- https://dl.google.com/android/repository/android-ndk-r21e-linux-x86_64.zip
+ https://dl.google.com/android/repository/android-ndk-r24-linux.zip
RUN unzip ndk.zip
-RUN mv android-ndk-r21e /ndk
+RUN mv android-ndk-r24 /ndk
RUN curl -L -o platform-tools.zip \
https://dl.google.com/android/repository/platform-tools-latest-linux.zip
RUN unzip platform-tools.zip platform-tools/adb
diff --git a/buildSrc/src/main/kotlin/com/android/ndkports/Abi.kt b/buildSrc/src/main/kotlin/com/android/ndkports/Abi.kt
index 155c59c..f6dbc01 100644
--- a/buildSrc/src/main/kotlin/com/android/ndkports/Abi.kt
+++ b/buildSrc/src/main/kotlin/com/android/ndkports/Abi.kt
@@ -24,9 +24,9 @@
val triple: String,
val minSupportedVersion: Int
) {
- Arm("arm", "armeabi-v7a", "arm-linux-androideabi", 16),
+ Arm("arm", "armeabi-v7a", "arm-linux-androideabi", 19),
Arm64("arm64", "arm64-v8a", "aarch64-linux-android", 21),
- X86("x86", "x86", "i686-linux-android", 16),
+ X86("x86", "x86", "i686-linux-android", 19),
X86_64("x86_64", "x86_64", "x86_64-linux-android", 21);
fun adjustMinSdkVersion(minSdkVersion: Int) =
diff --git a/buildSrc/src/main/kotlin/com/android/ndkports/Toolchain.kt b/buildSrc/src/main/kotlin/com/android/ndkports/Toolchain.kt
index 1293ecb..4e32a25 100644
--- a/buildSrc/src/main/kotlin/com/android/ndkports/Toolchain.kt
+++ b/buildSrc/src/main/kotlin/com/android/ndkports/Toolchain.kt
@@ -32,9 +32,12 @@
val sysrootLibs = ndk.sysrootDirectory.resolve("usr/lib/$binutilsTriple")
val binDir = ndk.toolchainBinDirectory
- val ar = binDir.resolve("$binutilsTriple-ar")
+ val ar = binDir.resolve("llvm-ar")
val clang = binDir.resolve("$clangTriple-clang")
val clangxx = binDir.resolve("$clangTriple-clang++")
- val ranlib = binDir.resolve("$binutilsTriple-ranlib")
- val strip = binDir.resolve("$binutilsTriple-strip")
+ val nm = binDir.resolve("llvm-nm")
+ val objdump = binDir.resolve("llvm-objdump")
+ val ranlib = binDir.resolve("llvm-ranlib")
+ val readelf = binDir.resolve("llvm-readelf")
+ val strip = binDir.resolve("llvm-strip")
}
\ No newline at end of file
diff --git a/curl/build.gradle.kts b/curl/build.gradle.kts
index 089ef04..722c309 100644
--- a/curl/build.gradle.kts
+++ b/curl/build.gradle.kts
@@ -19,7 +19,7 @@
ndkPorts {
ndkPath.set(File(project.findProperty("ndkPath") as String))
source.set(project.file("src.tar.gz"))
- minSdkVersion.set(16)
+ minSdkVersion.set(19)
}
tasks.prefab {
@@ -35,14 +35,6 @@
"--with-ca-path=/system/etc/security/cacerts",
"--with-ssl=$sysroot"
)
-
- // aarch64 still defaults to bfd which transitively checks libraries.
- // When curl is linking one of its own libraries which depends on
- // openssl, it doesn't pass -rpath-link to be able to find the SSL
- // libraries and fails to build because of it.
- //
- // TODO: Switch to lld once we're using r21.
- env("LDFLAGS", "-fuse-ld=gold")
}
}
