Update to NDK r28 to support 16kb pages.

This commit is contained in:
Greyson Parrelli 2025-04-10 15:38:52 -04:00 committed by GitHub
parent 7bf811e942
commit 32640edd69
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 52 additions and 49 deletions

1
.gitignore vendored
View File

@ -13,3 +13,4 @@
.externalNativeBuild
.idea
gradle.properties
**/.cxx

View File

@ -4,10 +4,9 @@ buildscript {
repositories {
google()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.3.2'
classpath 'com.android.tools.build:gradle:8.9.1'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
@ -18,7 +17,6 @@ allprojects {
repositories {
google()
jcenter()
}
}

View File

@ -1,6 +1,6 @@
#Tue Apr 09 17:56:40 PDT 2019
#Wed Apr 09 14:38:15 EDT 2025
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip

View File

@ -1,5 +1,5 @@
apply plugin: 'com.android.library'
apply plugin: 'maven'
apply plugin: 'maven-publish'
apply plugin: 'signing'
archivesBaseName = "aesgcmprovider"
@ -7,10 +7,12 @@ version = "0.0.3"
group = "org.signal"
android {
compileSdkVersion 26
namespace "org.signal.aesgcmprovider"
compileSdkVersion 35
defaultConfig {
minSdkVersion 19
targetSdkVersion 26
minSdkVersion 21
targetSdkVersion 34
ndkVersion "28.0.13004108"
versionCode 1
versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@ -33,10 +35,13 @@ android {
path "src/main/cpp/CMakeLists.txt"
}
}
publishing {
singleVariant("release")
}
}
dependencies {
testImplementation 'junit:junit:4.12'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
androidTestImplementation 'org.mockito:mockito-android:2.7.22'
@ -60,55 +65,55 @@ def getRepositoryPassword() {
}
signing {
required { isReleaseBuild() && gradle.taskGraph.hasTask("uploadArchives") }
required { isReleaseBuild() && gradle.taskGraph.hasTask("publishing") }
sign configurations.archives
}
uploadArchives {
configuration = configurations.archives
repositories.mavenDeployer {
beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
afterEvaluate {
publishing {
publications {
mavenJava(MavenPublication) {
from components.release
groupId = group
artifactId = archivesBaseName
repository(url: getReleaseRepositoryUrl()) {
authentication(userName: getRepositoryUsername(), password: getRepositoryPassword())
}
pom {
name = 'aesgcmprovider'
packaging = 'aar'
description = 'A BoringSSL-backed AES-GCM provider for Android'
url = 'https://github.com/signalapp/AES-GCM-Provider'
pom.project {
name 'aesgcmprovider'
packaging 'aar'
description 'A BoringSSL-backed AES-GCM provider for Android'
url 'https://github.com/signalapp/AES-GCM-Provider'
scm {
url = 'scm:git@github.com:signalapp/AES-GCM-Provider.git'
connection = 'scm:git@github.com:signalapp/AES-GCM-Provider.git'
developerConnection = 'scm:git@github.com:signalapp/AES-GCM-Provider.git'
}
scm {
url 'scm:git@github.com:signalapp/AES-GCM-Provider.git'
connection 'scm:git@github.com:signalapp/AES-GCM-Provider.git'
developerConnection 'scm:git@github.com:signalapp/AES-GCM-Provider.git'
}
licenses {
license {
name = 'AGPLv3'
url = 'https://www.gnu.org/licenses/agpl-3.0.html'
distribution = 'repo'
}
}
licenses {
license {
name 'AGPLv3'
url 'https://www.gnu.org/licenses/agpl-3.0.html'
distribution 'repo'
developers {
developer {
name = 'Moxie Marlinspike'
}
}
}
}
}
developers {
developer {
name 'Moxie Marlinspike'
repositories {
maven {
url = getReleaseRepositoryUrl()
credentials {
username = getRepositoryUsername()
password = getRepositoryPassword()
}
}
}
}
}
task installArchives(type: Upload) {
description "Installs the artifacts to the local Maven repository."
configuration = configurations['archives']
repositories {
mavenDeployer {
repository url: "file://${System.properties['user.home']}/.m2/repository"
}
}
}

View File

@ -113,7 +113,7 @@ endif()
if(CMAKE_COMPILER_IS_GNUCXX OR CLANG)
# Note clang-cl is odd and sets both CLANG and MSVC. We base our configuration
# primarily on our normal Clang one.
set(C_CXX_FLAGS "-Werror -Wformat=2 -Wsign-compare -Wmissing-field-initializers -Wwrite-strings")
set(C_CXX_FLAGS "-Wformat=2 -Wsign-compare -Wmissing-field-initializers -Wwrite-strings")
if(MSVC)
# clang-cl sets different default warnings than clang. It also treats -Wall
# as -Weverything, to match MSVC. Instead -W3 is the alias for -Wall.

View File

@ -67,7 +67,6 @@ posix_copts = [
# This list of warnings should match those in the top-level CMakeLists.txt.
"-Wall",
"-Werror",
"-Wformat=2",
"-Wsign-compare",
"-Wmissing-field-initializers",