Last active
February 27, 2020 17:03
-
-
Save badboy/12c37061da89631e506f0ed34e773fef to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
From c24feb07427f704e9d822ff8e8f00e26fb441141 Mon Sep 17 00:00:00 2001 | |
From: Jan-Erik Rediger <[email protected]> | |
Date: Thu, 27 Feb 2020 17:52:25 +0100 | |
Subject: [PATCH] Configure app build in the corresponding build.gradle | |
--- | |
clients/android/app/build.gradle | 7 +++++++ | |
clients/android/build.gradle | 8 -------- | |
2 files changed, 7 insertions(+), 8 deletions(-) | |
diff --git a/clients/android/app/build.gradle b/clients/android/app/build.gradle | |
index 1788ef2..9f0285f 100644 | |
--- a/clients/android/app/build.gradle | |
+++ b/clients/android/app/build.gradle | |
@@ -1,4 +1,5 @@ | |
apply plugin: 'com.android.application' | |
+apply plugin: 'org.mozilla.rust-android-gradle.rust-android' | |
android { | |
compileSdkVersion 29 | |
@@ -38,3 +39,9 @@ dependencies { | |
androidTestImplementation 'androidx.test:runner:1.1.1' | |
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' | |
} | |
+ | |
+cargo { | |
+ module = "../../../librobot" | |
+ libname = "librobot" | |
+ targets = ["arm64", "arm", "x86", "x86_64", "linux-x86-64"] | |
+} | |
diff --git a/clients/android/build.gradle b/clients/android/build.gradle | |
index 5f9aed4..50932e6 100644 | |
--- a/clients/android/build.gradle | |
+++ b/clients/android/build.gradle | |
@@ -1,7 +1,5 @@ | |
// Top-level build file where you can add configuration options common to all sub-projects/modules. | |
-apply plugin: 'org.mozilla.rust-android-gradle.rust-android' | |
- | |
buildscript { | |
repositories { | |
google() | |
@@ -18,12 +16,6 @@ buildscript { | |
} | |
-cargo { | |
- module = "../../librobot" | |
- libname = "librobot" | |
- targets = ["arm64", "arm", "x86", "x86_64", "linux-x86-64"] | |
-} | |
- | |
allprojects { | |
repositories { | |
google() | |
-- | |
2.25.0 | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment