nutomic/syncthing-android
1
0
Fork 0
mirror of https://github.com/syncthing/syncthing-android.git synced 2024-12-01 16:51:16 +00:00
Code Releases Activity

Update NDK to android-ndk-r18 (#68)

Browse source 
* Update NDK to android-ndk-r18

* Update build.gradle, resolve lint warnings
This commit is contained in:
Catfriend1 2018-09-22 19:19:18 +02:00 committed by GitHub
parent 73775a116d
commit 1f3abb127b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -33,7 +33,7 @@ gradle/wrapper/gradlew*
syncthing/go syncthing/go
syncthing/go.tgz syncthing/go.tgz
syncthing/go.zip syncthing/go.zip
syncthing/android-ndk-r16b syncthing/android-ndk-r*
syncthing/ndk.zip syncthing/ndk.zip
# External build artifacts # External build artifacts

6
app/build.gradle
View file

@ -4,14 +4,14 @@ apply plugin: 'com.github.triplet.play'
dependencies { dependencies {
implementation 'eu.chainfire:libsuperuser:1.0.0.201704021214' implementation 'eu.chainfire:libsuperuser:1.0.0.201704021214'
implementation 'com.android.support:design:27.0.2' implementation 'com.android.support:design:27.1.1'
implementation 'com.google.zxing:android-integration:3.3.0' implementation 'com.google.zxing:android-integration:3.3.0'
implementation 'com.google.code.gson:gson:2.8.2' implementation 'com.google.code.gson:gson:2.8.2'
implementation 'org.mindrot:jbcrypt:0.4' implementation 'org.mindrot:jbcrypt:0.4'
implementation 'com.google.guava:guava:23.6-android' implementation 'com.google.guava:guava:23.6-android'
implementation 'com.annimon:stream:1.1.9' implementation 'com.annimon:stream:1.1.9'
implementation 'com.android.volley:volley:1.1.0' implementation 'com.android.volley:volley:1.1.0'
implementation 'com.android.support.constraint:constraint-layout:1.1.2' implementation 'com.android.support.constraint:constraint-layout:1.1.3'
implementation 'com.google.dagger:dagger:2.14.1' implementation 'com.google.dagger:dagger:2.14.1'
annotationProcessor "com.google.dagger:dagger-compiler:2.14.1" annotationProcessor "com.google.dagger:dagger-compiler:2.14.1"
androidTestImplementation 'com.android.support.test:rules:1.0.2' androidTestImplementation 'com.android.support.test:rules:1.0.2'
@ -21,7 +21,7 @@ dependencies {
android { android {
// Changes to these values need to be reflected in `.travis.yml` // Changes to these values need to be reflected in `.travis.yml`
compileSdkVersion 27 compileSdkVersion 27
buildToolsVersion '27.0.3' buildToolsVersion '28.0.2'
buildTypes.debug.applicationIdSuffix ".debug" buildTypes.debug.applicationIdSuffix ".debug"
dataBinding.enabled = true dataBinding.enabled = true

BIN
app/src/main/res/drawable-hdpi/ic_settings_white_24dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 412 B

BIN
app/src/main/res/drawable-mdpi/ic_settings_white_24dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 304 B

BIN
app/src/main/res/drawable-xhdpi/ic_settings_white_24dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 538 B

BIN
app/src/main/res/drawable-xxhdpi/ic_settings_white_24dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 726 B

BIN
app/src/main/res/drawable-xxxhdpi/ic_settings_white_24dp.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 743 B

After

Width:  |  Height:  |  Size: 1,018 B

2
build.gradle
View file

@ -6,7 +6,7 @@ buildscript {
jcenter() jcenter()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.1.3' classpath 'com.android.tools.build:gradle:3.1.4'
classpath 'com.github.triplet.gradle:play-publisher:1.2.0' classpath 'com.github.triplet.gradle:play-publisher:1.2.0'
classpath 'com.github.ben-manes:gradle-versions-plugin:0.15.0' classpath 'com.github.ben-manes:gradle-versions-plugin:0.15.0'

12
syncthing/build-syncthing.py
View file

@ -136,12 +136,12 @@ def install_ndk():
# Consts. # Consts.
pwd_path = os.path.dirname(os.path.realpath(__file__)) pwd_path = os.path.dirname(os.path.realpath(__file__))
if sys.platform == 'win32': if sys.platform == 'win32':
url = 'https://dl.google.com/android/repository/android-ndk-r16b-windows-x86_64.zip' url = 'https://dl.google.com/android/repository/android-ndk-r18-windows-x86_64.zip'
expected_shasum = 'f3f1909ed1052e98dda2c79d11c22f3da28daf25' expected_shasum = '7fc0e0f94d86ea389bd18761abdc1bae2c005587'
else: else:
url = 'https://dl.google.com/android/repository/android-ndk-r16b-linux-x86_64.zip' url = 'https://dl.google.com/android/repository/android-ndk-r18-linux-x86_64.zip'
expected_shasum = '42aa43aae89a50d1c66c3f9fdecd676936da6128' expected_shasum = '2ac2e8e1ef73ed551cac3a1479bb28bd49369212'
zip_fullfn = pwd_path + os.path.sep + 'ndk.zip'; zip_fullfn = pwd_path + os.path.sep + 'ndk.zip';
# Download NDK. # Download NDK.
@ -161,10 +161,10 @@ def install_ndk():
print("[ok] Checksum of", zip_fullfn, "matches expected value.") print("[ok] Checksum of", zip_fullfn, "matches expected value.")
# Proceed with extraction of the NDK if necessary. # Proceed with extraction of the NDK if necessary.
ndk_home_path = pwd_path + os.path.sep + 'android-ndk-r16b' ndk_home_path = pwd_path + os.path.sep + 'android-ndk-r18'
if not os.path.isfile(ndk_home_path + os.path.sep + "sysroot" + os.path.sep + "NOTICE"): if not os.path.isfile(ndk_home_path + os.path.sep + "sysroot" + os.path.sep + "NOTICE"):
print("Extracting NDK ...") print("Extracting NDK ...")
# This will go to a subfolder "android-ndk-r16b" in the current path. # This will go to a subfolder "android-ndk-r18" in the current path.
file_name, file_extension = os.path.splitext(url_base_name) file_name, file_extension = os.path.splitext(url_base_name)
zip = zipfile.ZipFile(zip_fullfn, 'r') zip = zipfile.ZipFile(zip_fullfn, 'r')
zip.extractall(pwd_path) zip.extractall(pwd_path)