diff --git a/.idea/gradle.xml b/.idea/gradle.xml index a2d7c21..a0de2a1 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -7,6 +7,7 @@ + diff --git a/.idea/misc.xml b/.idea/misc.xml index bdd9278..54d5acd 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,7 +1,7 @@ - + diff --git a/README.md b/README.md index 4e8d79b..b70e559 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ # Building +Clone repo, open project in Android Studio. + Make sure the required Android NDK platforms are installed, and the environment variable `ANDROID_NDK_TOOLCHAIN_DIR` is configured correctly. @@ -8,3 +10,7 @@ On Windows, this might be a path such as the following (NDK "Side by side" SDK t ``` %LOCALAPPDATA%\Android\Sdk\ndk\25.1.8937393\toolchains\llvm\prebuilt\windows-x86_64\bin ``` + +Set your API ID and hash in the rust code. + +Sync gradle files, and "build" should work. diff --git a/app/build.gradle b/app/build.gradle index 34f48af..40e655a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -69,7 +69,7 @@ dependencies { cargo { module = "../native" libname = "talaria" - targets = ["arm64", "arm", "x86"] + targets = ["arm64"] profile = 'release' } diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 diff --git a/native/Cargo.toml b/native/Cargo.toml index 9741819..07487a2 100644 --- a/native/Cargo.toml +++ b/native/Cargo.toml @@ -9,10 +9,10 @@ crate-type = ["cdylib"] [dependencies] jni = { version = "0.10.2", default-features = false } -# v0.4 of grammers-* is currently unreleased; clone the project and use path dependencies -grammers-client = { version = "0.4.0" } -grammers-tl-types = { version = "0.4.0" } -grammers-session = { version = "0.4.0" } +# v0.4 of grammers-* is currently unreleased; clone the project and use path dependencies, delete version =. +grammers-client = { path = "/home/tanuj/code/grammers/lib/grammers-client" } +grammers-tl-types = { path = "/home/tanuj/code/grammers/lib/grammers-tl-types" } +grammers-session = { path = "/home/tanuj/code/grammers/lib/grammers-session" } tokio = { version = "1.5.0", features = ["full"] } log = "0.4.14" android_logger = "0.11.1"