aboutsummaryrefslogtreecommitdiff
path: root/android_gradle/app/src/main/java/com/google
diff options
context:
space:
mode:
authorPaul Thomson <paulthomson@users.noreply.github.com>2021-09-28 13:28:55 +0000
committerGitHub <noreply@github.com>2021-09-28 14:28:55 +0100
commit93e89eed2c22deb62b2d0a46a2e376c5132775cd (patch)
tree638dac80320509529d7e7be043a92e28a7b17194 /android_gradle/app/src/main/java/com/google
parent6b3fcb0353533d1236035c4aa3b587be5d8b37cd (diff)
downloadamber-93e89eed2c22deb62b2d0a46a2e376c5132775cd.tar.gz
Update and improve android_gradle (#965)
* Update CMakeLists.txt files so we can build libamber_ndk.so for Android via CMake. * `android_gradle/`: * Update Gradle version, settings, and build files to match the latest Android sample. Importantly, this removes the use of jcenter and bintray repositories, which were shut down. * Specify NDK version so that Gradle can install required native build tools automatically. * Define externalNativeBuild so Gradle can perform the Android CMake build automatically. * Replace `main` with `android_main` when building the Amber tool as a library for Android to avoid compiler warnings, and rename other Android-related symbols to avoid confusion. Fixes #964
Diffstat (limited to 'android_gradle/app/src/main/java/com/google')
-rw-r--r--android_gradle/app/src/main/java/com/google/amber/Amber.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/android_gradle/app/src/main/java/com/google/amber/Amber.java b/android_gradle/app/src/main/java/com/google/amber/Amber.java
index 8319ccf..008c528 100644
--- a/android_gradle/app/src/main/java/com/google/amber/Amber.java
+++ b/android_gradle/app/src/main/java/com/google/amber/Amber.java
@@ -19,5 +19,5 @@ public class Amber {
System.loadLibrary("amber_ndk");
}
- public static native int androidMain(String[] args, String stdout_file, String stderr_file);
+ public static native int androidHelper(String[] args, String stdout_file, String stderr_file);
}