summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcyBerta <cyberta@riseup.net>2021-07-09 04:56:56 +0200
committercyBerta <cyberta@riseup.net>2021-07-21 22:02:28 +0200
commitcdefcb0d109d4558d5b9531bde2178a8b9bad0dc (patch)
tree322f1649ec57bd9aaecd469f7da590c90cca8062
parent6d410f65f1145fd69e9417a2a99e78581630d814 (diff)
use bitmaskcore libs in android project
-rw-r--r--app/build.gradle12
-rw-r--r--bitmask-core/bitmask-core-sources.jarbin6880 -> 0 bytes
-rw-r--r--bitmask-core/bitmask-core.aarbin9015381 -> 0 bytes
-rw-r--r--bitmask-core/build.gradle2
-rw-r--r--bitmask-web-core/bitmask-web-core-sources.jarbin8696 -> 0 bytes
-rw-r--r--bitmask-web-core/bitmask-web-core.aarbin10633994 -> 0 bytes
-rw-r--r--lib-bitmask-core-arm64/bitmaskcore_arm64-sources.jarbin0 -> 8156 bytes
-rw-r--r--lib-bitmask-core-arm64/bitmaskcore_arm64.aarbin0 -> 6083935 bytes
-rw-r--r--lib-bitmask-core-arm64/build.gradle2
-rw-r--r--lib-bitmask-core-armv7/bitmaskcore_arm-sources.jarbin0 -> 8156 bytes
-rw-r--r--lib-bitmask-core-armv7/bitmaskcore_arm.aarbin0 -> 6236825 bytes
-rw-r--r--lib-bitmask-core-armv7/build.gradle2
-rw-r--r--lib-bitmask-core-web/bitmaskcore_web-sources.jarbin0 -> 10013 bytes
-rw-r--r--lib-bitmask-core-web/bitmaskcore_web.aarbin0 -> 26629129 bytes
-rw-r--r--lib-bitmask-core-web/build.gradle2
-rw-r--r--lib-bitmask-core-x86/bitmaskcore_x86-sources.jarbin0 -> 8156 bytes
-rw-r--r--lib-bitmask-core-x86/bitmaskcore_x86.aarbin0 -> 6639027 bytes
-rw-r--r--lib-bitmask-core-x86/build.gradle2
-rw-r--r--lib-bitmask-core-x86_64/bitmaskcore_x86_64-sources.jarbin0 -> 8156 bytes
-rw-r--r--lib-bitmask-core-x86_64/bitmaskcore_x86_64.aarbin0 -> 6823506 bytes
-rw-r--r--lib-bitmask-core-x86_64/build.gradle2
-rw-r--r--lib-bitmask-core/bitmaskcore-sources.jarbin0 -> 8156 bytes
-rw-r--r--lib-bitmask-core/bitmaskcore.aarbin0 -> 25748179 bytes
-rw-r--r--lib-bitmask-core/build.gradle (renamed from bitmask-web-core/build.gradle)2
-rwxr-xr-xscripts/build_deps.sh16
-rw-r--r--settings.gradle2
26 files changed, 32 insertions, 12 deletions
diff --git a/app/build.gradle b/app/build.gradle
index 7f4f667e..87c28be2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -394,12 +394,12 @@ dependencies {
implementation 'info.guardianproject:tor-android:0.4.5.7'
implementation 'info.guardianproject:jtorctl:0.4.5.7'
- fatwebImplementation project(path: ':bitmask-web-core')
- fatImplementation project(path: ':bitmask-core')
- x86Implementation project(path: ':bitmask-core')
- x86_64Implementation project(path: ':bitmask-core')
- armv7Implementation project(path: ':bitmask-core')
- arm64Implementation project(path: ':bitmask-core')
+ fatwebImplementation project(path: ':lib-bitmask-core-web')
+ fatImplementation project(path: ':lib-bitmask-core')
+ x86Implementation project(path: ':lib-bitmask-core-x86')
+ x86_64Implementation project(path: ':lib-bitmask-core-x86_64')
+ armv7Implementation project(path: ':lib-bitmask-core-armv7')
+ arm64Implementation project(path: ':lib-bitmask-core-arm64')
}
android.applicationVariants.all { variant ->
diff --git a/bitmask-core/bitmask-core-sources.jar b/bitmask-core/bitmask-core-sources.jar
deleted file mode 100644
index adf7f860..00000000
--- a/bitmask-core/bitmask-core-sources.jar
+++ /dev/null
Binary files differ
diff --git a/bitmask-core/bitmask-core.aar b/bitmask-core/bitmask-core.aar
deleted file mode 100644
index bceec02d..00000000
--- a/bitmask-core/bitmask-core.aar
+++ /dev/null
Binary files differ
diff --git a/bitmask-core/build.gradle b/bitmask-core/build.gradle
deleted file mode 100644
index 51d38614..00000000
--- a/bitmask-core/build.gradle
+++ /dev/null
@@ -1,2 +0,0 @@
-configurations.maybeCreate("default")
-artifacts.add("default", file('bitmask-core.aar')) \ No newline at end of file
diff --git a/bitmask-web-core/bitmask-web-core-sources.jar b/bitmask-web-core/bitmask-web-core-sources.jar
deleted file mode 100644
index 64edeb9b..00000000
--- a/bitmask-web-core/bitmask-web-core-sources.jar
+++ /dev/null
Binary files differ
diff --git a/bitmask-web-core/bitmask-web-core.aar b/bitmask-web-core/bitmask-web-core.aar
deleted file mode 100644
index 0e5108c0..00000000
--- a/bitmask-web-core/bitmask-web-core.aar
+++ /dev/null
Binary files differ
diff --git a/lib-bitmask-core-arm64/bitmaskcore_arm64-sources.jar b/lib-bitmask-core-arm64/bitmaskcore_arm64-sources.jar
new file mode 100644
index 00000000..903904ed
--- /dev/null
+++ b/lib-bitmask-core-arm64/bitmaskcore_arm64-sources.jar
Binary files differ
diff --git a/lib-bitmask-core-arm64/bitmaskcore_arm64.aar b/lib-bitmask-core-arm64/bitmaskcore_arm64.aar
new file mode 100644
index 00000000..bf1b3fda
--- /dev/null
+++ b/lib-bitmask-core-arm64/bitmaskcore_arm64.aar
Binary files differ
diff --git a/lib-bitmask-core-arm64/build.gradle b/lib-bitmask-core-arm64/build.gradle
new file mode 100644
index 00000000..91598024
--- /dev/null
+++ b/lib-bitmask-core-arm64/build.gradle
@@ -0,0 +1,2 @@
+configurations.maybeCreate("default")
+artifacts.add("default", file('bitmaskcore_arm64.aar')) \ No newline at end of file
diff --git a/lib-bitmask-core-armv7/bitmaskcore_arm-sources.jar b/lib-bitmask-core-armv7/bitmaskcore_arm-sources.jar
new file mode 100644
index 00000000..903904ed
--- /dev/null
+++ b/lib-bitmask-core-armv7/bitmaskcore_arm-sources.jar
Binary files differ
diff --git a/lib-bitmask-core-armv7/bitmaskcore_arm.aar b/lib-bitmask-core-armv7/bitmaskcore_arm.aar
new file mode 100644
index 00000000..f56b2b2c
--- /dev/null
+++ b/lib-bitmask-core-armv7/bitmaskcore_arm.aar
Binary files differ
diff --git a/lib-bitmask-core-armv7/build.gradle b/lib-bitmask-core-armv7/build.gradle
new file mode 100644
index 00000000..b48f6c42
--- /dev/null
+++ b/lib-bitmask-core-armv7/build.gradle
@@ -0,0 +1,2 @@
+configurations.maybeCreate("default")
+artifacts.add("default", file('bitmaskcore_arm.aar')) \ No newline at end of file
diff --git a/lib-bitmask-core-web/bitmaskcore_web-sources.jar b/lib-bitmask-core-web/bitmaskcore_web-sources.jar
new file mode 100644
index 00000000..7507016b
--- /dev/null
+++ b/lib-bitmask-core-web/bitmaskcore_web-sources.jar
Binary files differ
diff --git a/lib-bitmask-core-web/bitmaskcore_web.aar b/lib-bitmask-core-web/bitmaskcore_web.aar
new file mode 100644
index 00000000..154101b3
--- /dev/null
+++ b/lib-bitmask-core-web/bitmaskcore_web.aar
Binary files differ
diff --git a/lib-bitmask-core-web/build.gradle b/lib-bitmask-core-web/build.gradle
new file mode 100644
index 00000000..da284c75
--- /dev/null
+++ b/lib-bitmask-core-web/build.gradle
@@ -0,0 +1,2 @@
+configurations.maybeCreate("default")
+artifacts.add("default", file('bitmaskcore_web.aar')) \ No newline at end of file
diff --git a/lib-bitmask-core-x86/bitmaskcore_x86-sources.jar b/lib-bitmask-core-x86/bitmaskcore_x86-sources.jar
new file mode 100644
index 00000000..903904ed
--- /dev/null
+++ b/lib-bitmask-core-x86/bitmaskcore_x86-sources.jar
Binary files differ
diff --git a/lib-bitmask-core-x86/bitmaskcore_x86.aar b/lib-bitmask-core-x86/bitmaskcore_x86.aar
new file mode 100644
index 00000000..64867109
--- /dev/null
+++ b/lib-bitmask-core-x86/bitmaskcore_x86.aar
Binary files differ
diff --git a/lib-bitmask-core-x86/build.gradle b/lib-bitmask-core-x86/build.gradle
new file mode 100644
index 00000000..87add92f
--- /dev/null
+++ b/lib-bitmask-core-x86/build.gradle
@@ -0,0 +1,2 @@
+configurations.maybeCreate("default")
+artifacts.add("default", file('bitmaskcore_x86.aar')) \ No newline at end of file
diff --git a/lib-bitmask-core-x86_64/bitmaskcore_x86_64-sources.jar b/lib-bitmask-core-x86_64/bitmaskcore_x86_64-sources.jar
new file mode 100644
index 00000000..903904ed
--- /dev/null
+++ b/lib-bitmask-core-x86_64/bitmaskcore_x86_64-sources.jar
Binary files differ
diff --git a/lib-bitmask-core-x86_64/bitmaskcore_x86_64.aar b/lib-bitmask-core-x86_64/bitmaskcore_x86_64.aar
new file mode 100644
index 00000000..6579fa2f
--- /dev/null
+++ b/lib-bitmask-core-x86_64/bitmaskcore_x86_64.aar
Binary files differ
diff --git a/lib-bitmask-core-x86_64/build.gradle b/lib-bitmask-core-x86_64/build.gradle
new file mode 100644
index 00000000..bc8181b3
--- /dev/null
+++ b/lib-bitmask-core-x86_64/build.gradle
@@ -0,0 +1,2 @@
+configurations.maybeCreate("default")
+artifacts.add("default", file('bitmaskcore_x86_64.aar')) \ No newline at end of file
diff --git a/lib-bitmask-core/bitmaskcore-sources.jar b/lib-bitmask-core/bitmaskcore-sources.jar
new file mode 100644
index 00000000..903904ed
--- /dev/null
+++ b/lib-bitmask-core/bitmaskcore-sources.jar
Binary files differ
diff --git a/lib-bitmask-core/bitmaskcore.aar b/lib-bitmask-core/bitmaskcore.aar
new file mode 100644
index 00000000..19da0b2a
--- /dev/null
+++ b/lib-bitmask-core/bitmaskcore.aar
Binary files differ
diff --git a/bitmask-web-core/build.gradle b/lib-bitmask-core/build.gradle
index 650f38d6..0b2ba086 100644
--- a/bitmask-web-core/build.gradle
+++ b/lib-bitmask-core/build.gradle
@@ -34,4 +34,4 @@ dependencies {
}
*/
configurations.maybeCreate("default")
-artifacts.add("default", file('bitmask-web-core.aar')) \ No newline at end of file
+artifacts.add("default", file('bitmaskcore.aar')) \ No newline at end of file
diff --git a/scripts/build_deps.sh b/scripts/build_deps.sh
index 75fd52ea..1d8d26d5 100755
--- a/scripts/build_deps.sh
+++ b/scripts/build_deps.sh
@@ -37,6 +37,18 @@ else
then
mkdir lib
fi
- ./build_core.sh
- cd ..
+ ./build_core.sh || quit "failed to build bitmaskcore"
+ cp lib/bitmaskcore.aar ../lib-bitmask-core/.
+ cp lib/bitmaskcore-sources.jar ../lib-bitmask-core/.
+ cp lib/bitmaskcore_web.aar ../lib-bitmask-core-web/.
+ cp lib/bitmaskcore_web-sources.jar ../lib-bitmask-core-web/.
+ cp lib/bitmaskcore_arm.aar ../lib-bitmask-core-armv7/.
+ cp lib/bitmaskcore_arm-sources.jar ../lib-bitmask-core-armv7/.
+ cp lib/bitmaskcore_arm64.aar ../lib-bitmask-core-arm64/.
+ cp lib/bitmaskcore_arm64-sources.jar ../lib-bitmask-core-arm64/.
+ cp lib/bitmaskcore_x86.aar ../lib-bitmask-core-x86/.
+ cp lib/bitmaskcore_x86-sources.jar ../lib-bitmask-core-x86/.
+ cp lib/bitmaskcore_x86_64.aar ../lib-bitmask-core-x86_64/.
+ cp lib/bitmaskcore_x86_64-sources.jar ../lib-bitmask-core-x86_64/.
+
fi
diff --git a/settings.gradle b/settings.gradle
index 203bf293..661a41c2 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include ':app', ':bitmask-core', ':bitmask-web-core', ':bitmaskcore', ':tor-android' \ No newline at end of file
+include ':app', ':lib-bitmask-core', ':lib-bitmask-core-web', ':lib-bitmask-core-arm64', ':lib-bitmask-core-armv7', ':lib-bitmask-core-x86', ':lib-bitmask-core-x86_64', ':bitmaskcore', ':tor-android' \ No newline at end of file