Unverified Commit 689c9c66 authored by Matthew Finkel's avatar Matthew Finkel
Browse files

Merge remote-tracking branch 'gkgl/bug_40061_v5'

parents f6b89500 3dad656f
#!/bin/bash
[% c("var/set_default_env") -%]
[% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %]
distdir=/var/tmp/dist
builddir=/var/tmp/build/[% project %]
mkdir -p $distdir/[% project %]
mkdir -p /var/tmp/build
[% IF !c("var/fetch_gradle_dependencies") %]
# XXX: Make this more generic and not only for geckoview-beta.
geckoview_version=$(find . -type f -name geckoview-beta-*.aar | cut -d \- -f 6 | cut -d \. -f 1-3)
gradle_repo=$rootdir/[% c('input_files_by_name/gradle-dependencies') %]
cp -r $gradle_repo/dl/android/maven2/* $gradle_repo
cp -r $gradle_repo/maven2/* $gradle_repo
cp -r $gradle_repo/m2/* $gradle_repo
tar -C $distdir -xf [% c('input_files_by_name/application-services') %]
# XXX: We could be smarter and just copy over the projects that are needed
# according to the Gradle dependencies list.
cp -rf $distdir/application-services/maven/org $gradle_repo
tar -C $distdir -xf [% c('input_files_by_name/geckoview') %]
[% END %]
tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz
cd $builddir-[% c('version') %]
patch -p1 < $rootdir/git.patch
[% IF c("var/fetch_gradle_dependencies") %]
# XXX: fetching deps for `assembleGeckoBeta -x lint` by using that same target
# results in some missing dependencies for yet unknown reasons. Thus, we use
# `assemble` instead for now.
gradle --debug -no-daemon assemble
[% ELSE %]
patch -p1 < $rootdir/mavenLocal.patch
# Make sure our GeckoView dependency is used. XXX: Make this more generic and
# not only for geckoview-beta.
cp -f $distdir/geckoview/*.aar $gradle_repo/org/mozilla/geckoview/geckoview-beta/$geckoview_version/geckoview-beta-$geckoview_version.aar
gradle_args="--offline --no-daemon -Dmaven.repo.local=$gradle_repo"
gradle $gradle_args assembleGeckoBeta -x lint
gradle $gradle_args publish
find components -regex '.*[0-9].\(aar\|pom\)' -exec cp --parents {} $distdir \;
# Package
cd $distdir
find components -type d -name maven -exec cp -rf {} [% project %] \;
[% c('tar', {
tar_src => [ project ],
tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'),
}) %]
[% END %]
# vim: filetype=yaml sw=2
version: '[% c("abbrev") %]'
filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %]'
git_hash: aeb63ebd079b646a3ec1b7b84d755653baa467d7
git_url: https://github.com/thaliproject/Tor_Onion_Proxy_Library.git
git_submodule: 1
version: v52.0.3
filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
git_hash: 98aedbeb17261966052dda3dbd9b2953e015e435 # v52.0.3
git_url: https://github.com/mozilla-mobile/android-components
var:
deps:
- build-essential
- unzip
- zip
container:
use_container: 1
# this should be updated when the list of gradle dependencies is changed
# This should be updated when the list of gradle dependencies is changed.
gradle_dependencies_version: 1
# Switch to make it easier to grab all dependencies during a dry-run.
fetch_gradle_dependencies: 0
targets:
nightly:
version: '[% c("abbrev") %]'
git_hash: 98aedbeb17261966052dda3dbd9b2953e015e435
input_files:
- project: container-image
- name: '[% c("var/compiler") %]'
project: '[% c("var/compiler") %]'
- project: obfs4
name: obfs4
- project: snowflake
name: snowflake
- name: geckoview
project: geckoview
pkg_type: merge_aars
enable: '[% !c("var/fetch_gradle_dependencies") %]'
- name: application-services
project: application-services
enable: '[% !c("var/fetch_gradle_dependencies") %]'
- filename: 'gradle-dependencies-[% c("var/gradle_dependencies_version") %]'
name: gradle-dependencies
exec: '[% INCLUDE "fetch-gradle-dependencies" %]'
- filename: gradle.patch
- filename: 0001-Bug-33931-Filter-bridges-in-stream-by-type.patch
- filename: 0001-Bug-30318-Add-snowflake-support.patch
enable: '[% !c("var/fetch_gradle_dependencies") %]'
- filename: git.patch
- filename: mavenLocal.patch
enable: '[% !c("var/fetch_gradle_dependencies") %]'
From a77b847b6451c598176137b944edf27e6e7202a2 Mon Sep 17 00:00:00 2001
From: Georg Koppen <gk@torproject.org>
Date: Sun, 19 Apr 2020 17:59:16 +0000
Subject: [PATCH 1/5] git patch
diff --git a/components/support/base/build.gradle b/components/support/base/build.gradle
index aa4c1b005..4318f1334 100644
--- a/components/support/base/build.gradle
+++ b/components/support/base/build.gradle
@@ -37,7 +37,7 @@ android {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
- buildConfigField("String", "GIT_HASH", "\"" + getGitHash() + "\"")
+ buildConfigField("String", "GIT_HASH", "\"release build\"")
}
}
--
2.27.0.rc0
This diff is collapsed.
From 6a88b59457dd38f0e8d69f0c2988bb2952075536 Mon Sep 17 00:00:00 2001
From: Georg Koppen <gk@torproject.org>
Date: Wed, 20 May 2020 14:18:12 +0000
Subject: [PATCH] mavenLocal() fixes
diff --git a/build.gradle b/build.gradle
index 9f298887a..278245d30 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,6 +6,7 @@ import static org.gradle.api.tasks.testing.TestResult.ResultType
buildscript {
repositories {
+ mavenLocal()
if (project.hasProperty("googleRepo")) {
maven {
name "Google"
@@ -48,6 +49,7 @@ plugins {
allprojects {
repositories {
+ mavenLocal()
if (project.hasProperty("googleRepo")) {
maven {
name "Google"
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index 9f05b8434..f97029ccf 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -7,6 +7,7 @@ plugins {
}
repositories {
+ mavenLocal()
jcenter()
}
diff --git a/buildSrc/settings.gradle b/buildSrc/settings.gradle
index c31ad3840..fb6526db3 100644
--- a/buildSrc/settings.gradle
+++ b/buildSrc/settings.gradle
@@ -1,10 +1,15 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+pluginManagement {
+ repositories {
+ mavenLocal()
+ }
+}
buildCache {
local {
directory = new File(rootDir, '../.build-cache')
removeUnusedEntriesAfterDays = 30
}
-}
\ No newline at end of file
+}
diff --git a/settings.gradle b/settings.gradle
index a6e8dfa49..049fa29d6 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -4,8 +4,15 @@
import org.yaml.snakeyaml.Yaml
+pluginManagement {
+ repositories {
+ mavenLocal()
+ }
+}
+
buildscript {
repositories {
+ mavenLocal()
jcenter()
}
--
2.28.0
......@@ -4,41 +4,60 @@ export PROJECT_PATH=/var/tmp/dist/[% project %]
export SDK_HOME=$PROJECT_PATH/android-sdk-linux
export NDK_HOME=$PROJECT_PATH/android-ndk
export GRADLE_HOME=$PROJECT_PATH/gradle
android_release_dir=android-10
android_release_dir_old=android-9
#Make directories
# Make directories
mkdir -p $NDK_HOME $SDK_HOME $GRADLE_HOME
# Compiler Archives
unzip -qq [% c("input_files_by_name/android_sdk_tools") %] -d $SDK_HOME
unzip -qq [% c("input_files_by_name/android_ndk_compiler")%] -d $NDK_HOME
# GeckoView is still using an older Android NDK, bundle it, too.
unzip -qq [% c("input_files_by_name/android_ndk_compiler_old")%] -d $NDK_HOME
unzip -qq [% c("input_files_by_name/gradle_bin") %] -d $GRADLE_HOME
# GeckoView is still using an older Gradle, bundle it, too.
unzip -qq [% c("input_files_by_name/gradle_bin_old") %] -d $GRADLE_HOME
# application-services is using a comparatively new Gradle, bundle it, too.
unzip -qq [% c("input_files_by_name/gradle_bin_new") %] -d $GRADLE_HOME
# NDK Archive
cd $NDK_HOME
mv android-ndk-r17b/* .
rm -fR android-ndk-r17b
# The architectures we support
./build/tools/make_standalone_toolchain.py --api [% c("var/android_min_api_armv7") %] --arch arm --install-dir=./arm
./build/tools/make_standalone_toolchain.py --api [% c("var/android_min_api_aarch64") %] --arch arm64 --install-dir=./arm64
./build/tools/make_standalone_toolchain.py --api [% c("var/android_min_api_x86") %] --arch x86 --install-dir=./x86
./build/tools/make_standalone_toolchain.py --api [% c("var/android_min_api_x86_64") %] --arch x86_64 --install-dir=./x86_64
for version in [% c("var/android_ndk_version") %][% c("var/android_ndk_revision") %] [% c("var/android_ndk_version_old") %]; do
# Adjust cross compilation prefix for armv7a. Unfortunately, the compiler cross
# compilation prefix and the one for all the other tools differ. Let's fix that
# so we only have to take care of one. See: #33557 (comment 2674649).
cd $NDK_HOME/android-ndk-r$version/toolchains/llvm/prebuilt/linux-x86_64/bin
for f in `ls arm-linux-androideabi-*`; do
ln -s $f ${f//arm-linux-androideabi/armv7a-linux-androideabi}
done
done
# Tool Archives
cd $SDK_HOME
unzip -qq $HOME/[% c("input_files_by_name/build_tools") %] -d $SDK_HOME
mkdir -p build-tools/27.0.3
mv android-8.1.0/* build-tools/27.0.3
mkdir -p build-tools/[% c("version") %]
mv $android_release_dir/* build-tools/[% c("version") %]
# Apart from GeckoView all other projects do still need build-tools 28.0.3 as
# they are using the Gradle plugin 3.2.1 - 3.6.0 without specifying
# `buildToolsVersion`.
unzip -qq $HOME/[% c("input_files_by_name/build_tools_old") %] -d $SDK_HOME
mkdir -p build-tools/[% c("version_old") %]
mv $android_release_dir_old/* build-tools/[% c("version_old") %]
unzip -qq $HOME/[% c("input_files_by_name/platform") %] -d $SDK_HOME
mkdir -p platforms/android-28
mv android-9/* platforms/android-28
mkdir -p platforms/android-[% c("var/android_api_level") %]
mv $android_release_dir/* platforms/android-[% c("var/android_api_level") %]
unzip -qq $HOME/[% c("input_files_by_name/platform_tools") %] -d $SDK_HOME
# That's a quirk required by GeckoView but let's have it here instead of in the
# project's build script
mkdir emulator
cp tools/emulator emulator/
# Cleanup
rm -fR android-8.1.0
rm -fR android-9
rm -fR $android_release_dir $android_release_dir_old
# Archive dist directory
cd /var/tmp/dist
......
# vim: filetype=yaml sw=2
filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
version: 27.0.3
version: 29.0.3
version_old: 28.0.3
var:
container:
use_container: 1
......@@ -11,29 +12,55 @@ var:
mkdir -p /var/tmp/dist
tar -C /var/tmp/dist -xf $rootdir/[% c("compiler_tarfile") %]
export ANDROID_SDK_HOME=/var/tmp/dist/[% project %]/android-sdk-linux
export ANDROID_NDK_HOME=/var/tmp/dist/[% project %]/android-ndk
# By default we use the old NDK which is the one GeckoView is using.
# However, we can overwrite that per project if needed (e.g.
# application-services is currently on a newer NDK).
export ANDROID_NDK_HOME=/var/tmp/dist/[% project %]/android-ndk/android-ndk-r[% c("var/android_ndk_version_old") %]
export GRADLE_HOME=/var/tmp/dist/[% project %]/gradle
export ANDROID_HOME=$ANDROID_SDK_HOME
export GRADLE_USER_HOME=$GRADLE_HOME
export PATH=$PATH:$ANDROID_NDK_HOME/[% c("var/toolchain_arch") %]/bin
export PATH=$PATH:$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin:$GRADLE_HOME/gradle-[% c("var/gradle_version") %]/bin
google_repo: https://dl.google.com/android/repository
android_api_level: 29
android_platform_revision: 04
android_ndk_version: 21
android_ndk_version_old: 20
android_ndk_revision: d
gradle_version_new: 6.3
gradle_version: 5.6.4
gradle_version_old: 5.1.1
input_files:
- project: container-image
- URL: '[% c("var/google_repo") %]/build-tools_r27.0.3-linux.zip'
- URL: '[% c("var/google_repo") %]/build-tools_r[% c("version") %]-linux.zip'
name: build_tools
sha256sum: 5e1f4fc5203f13de120c56f9cc103bb2e57d940959547506196ab10ddc9e6b97
- URL: '[% c("var/google_repo") %]/platform-28_r04.zip'
sha256sum: 5652d8cd5eaaade0b853bfe0ae6cbfa0706a6f70a0ebb25ca24a6f484ec3d855
- URL: '[% c("var/google_repo") %]/build-tools_r[% c("version_old") %]-linux.zip'
name: build_tools_old
sha256sum: 7954956a40633c88f693d638cbc23f68e9e2499dc7a4b7dfdaf6a3e91387749a
- URL: '[% c("var/google_repo") %]/platform-[% c("var/android_api_level") %]_r[% c("var/android_platform_revision") %].zip'
name: platform
sha256sum: 967f8ca99b71d337aa9c7781f9d65dd8110bf5c4746f44304047bf71b20d0ded
- URL: '[% c("var/google_repo") %]/platform-tools_r28.0.3-linux.zip'
sha256sum: c9eaf2ce4e8fa6f5a8036bd3c95363d003733bf0a1bd349718cadf802db44c69
# ./mach bootstrap is fetching the latest version, so it does not seem to
# matter which particular version we are using. Pin to the one fitting best to
# SDK version/build-tools version.
- URL: '[% c("var/google_repo") %]/platform-tools_r[% c("version") %]-linux.zip'
name: platform_tools
sha256sum: 38fccfe8d2646dd12bdd7cad22fedba0493425b98ebd6d620e4c670b9af4c53f
sha256sum: 49e676ec90bff1f7d7dfe4fb7d0ab78e14fa8fb06a8dccca2ef57a1bc29497a0
- URL: '[% c("var/google_repo") %]/sdk-tools-linux-4333796.zip'
name: android_sdk_tools
sha256sum: 92ffee5a1d98d856634e8b71132e8a95d96c83a63fde1099be3d86df3106def9
- URL: '[% c("var/google_repo") %]/android-ndk-r17b-linux-x86_64.zip'
- URL: '[% c("var/google_repo") %]/android-ndk-r[% c("var/android_ndk_version") %][% c("var/android_ndk_revision") %]-linux-x86_64.zip'
name: android_ndk_compiler
sha256sum: 5dfbbdc2d3ba859fed90d0e978af87c71a91a5be1f6e1c40ba697503d48ccecd
- URL: https://services.gradle.org/distributions/gradle-4.10.2-bin.zip
sha256sum: dd6dc090b6e2580206c64bcee499bc16509a5d017c6952dcd2bed9072af67cbd
- URL: '[% c("var/google_repo") %]/android-ndk-r[% c("var/android_ndk_version_old") %]-linux-x86_64.zip'
name: android_ndk_compiler_old
sha256sum: 57435158f109162f41f2f43d5563d2164e4d5d0364783a9a6fab3ef12cb06ce0
- URL: https://services.gradle.org/distributions/gradle-[% c("var/gradle_version_new") %]-bin.zip
name: gradle_bin_new
sha256sum: 038794feef1f4745c6347107b6726279d1c824f3fc634b60f86ace1e9fbd1768
- URL: https://services.gradle.org/distributions/gradle-[% c("var/gradle_version") %]-bin.zip
name: gradle_bin
sha256sum: b49c6da1b2cb67a0caf6c7480630b51c70a11ca2016ff2f555eaeda863143a29
sha256sum: 1f3067073041bc44554d0efe5d402a33bc3d3c93cc39ab684f308586d732a80d
- URL: https://services.gradle.org/distributions/gradle-[% c("var/gradle_version_old") %]-bin.zip
name: gradle_bin_old
sha256sum: 4953323605c5d7b89e97d0dc7779e275bccedefcdac090aec123375eae0cc798
This diff is collapsed.
#!/bin/bash
[% c("var/set_default_env") -%]
[% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %]
distdir=/var/tmp/dist/[% project %]
builddir=/var/tmp/build/[% project %]
mkdir $distdir
mkdir /var/tmp/build
cd /var/tmp/dist
[% FOREACH arch = ['armv7', 'aarch64', 'x86', 'x86_64'] -%]
# The host (i.e. Linux) bits should be the same for all four targets. Thus,
# extracting all input files into the same place should give us a working host
# part with all the needed target architectures.
tar -xf $rootdir/[% c('input_files_by_name/rust-' _ arch) %]
tar -xf $rootdir/[% c('input_files_by_name/nss-' _ arch) %]
mv nss nss-[% arch %]
tar -xf $rootdir/[% c('input_files_by_name/sqlcipher-' _ arch) %]
mv sqlcipher sqlcipher-[% arch %]
[% END -%]
export PATH=/var/tmp/dist/fenix-rust/bin:$PATH
cd $rootdir
# application-services uses a newer NDK, 21, than everything else...
export ANDROID_NDK_HOME=/var/tmp/dist/[% c('var/compiler') %]/android-ndk/android-ndk-r[% pc('android-toolchain', 'var/android_ndk_version') %][% pc('android-toolchain', 'var/android_ndk_revision') %]
# We need to add the new path to our build tools to PATH.
export PATH=$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH
export ANDROID_NDK_ROOT=$ANDROID_NDK_HOME
export ANDROID_NDK_API_VERSION=[% pc("android-toolchain", "var/android_ndk_version") %][% pc('android-toolchain', 'var/android_ndk_revision') %]
export JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-amd64
[% IF !c('var/fetch_gradle_dependencies') %]
gradle_repo=$rootdir/[% c('input_files_by_name/gradle-dependencies') %]
cp -r $gradle_repo/dl/android/maven2/* $gradle_repo
cp -r $gradle_repo/m2/* $gradle_repo
cp -r $gradle_repo/maven2/* $gradle_repo
[% END %]
tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz
# Prepare the offline build.
# Move the directory for hardcoding the path in .cargo/config.
mv /var/tmp/build/[% project %]-[% c('version') %] $builddir
tar -C $builddir -xjf application-services-vendor-[% c('var/rust_vendor_version') %].tar.bz2
cd $builddir
# Make sure our vendored crates are used for offline builds.
cat >> .cargo/config << 'EOF'
[source.crates-io]
replace-with = "vendored-sources"
[source.vendored-sources]
directory = "/var/tmp/build/application-services/vendor"
[net]
offline=true
EOF
# Move NSS and SQLCipher to the right place
# XXX: Maybe merge with the loop above.
archs="armv7 aarch64 x86 x86_64"
for a in $archs
do
if [ "$a" == "armv7" ]
then
mkdir -p libs/android/armeabi-v7a
mv /var/tmp/dist/nss-$a libs/android/armeabi-v7a/nss
mv /var/tmp/dist/sqlcipher-$a libs/android/armeabi-v7a/sqlcipher
elif [ "$a" == "aarch64" ]
then
mkdir -p libs/android/arm64-v8a
mv /var/tmp/dist/nss-$a libs/android/arm64-v8a/nss
mv /var/tmp/dist/sqlcipher-$a libs/android/arm64-v8a/sqlcipher
else
mkdir -p libs/android/$a
mv /var/tmp/dist/nss-$a libs/android/$a/nss
mv /var/tmp/dist/sqlcipher-$a libs/android/$a/sqlcipher
fi
done
patch -p1 < $rootdir/no-git.patch
# XXX: We don't build the code for Linux for now as this involves additional
# complexity. That's needed for running unit tests later on, though.
patch -p1 < $rootdir/target.patch
patch -p1 < $rootdir/1651660.patch
[% IF c('var/fetch_gradle_dependencies') %]
# XXX: `assemble` is still not enough to see all fetched dependencies via
# Gradle's --debug. See: tor-browser-build#40056.
$GRADLE_HOME/gradle-6.3/bin/gradle --debug --no-daemon assemble
[% ELSE %]
patch -p1 < $rootdir/mavenLocal.patch
gradle_flags="--offline --no-daemon -Dmaven.repo.local=$gradle_repo"
$GRADLE_HOME/gradle-6.3/bin/gradle $gradle_flags assembleRelease
$GRADLE_HOME/gradle-6.3/bin/gradle $gradle_flags publish
cd build
find maven -regex '.*[0-9].\(aar\|pom\)' -exec cp --parents {} $distdir \;
cd /var/tmp/dist
[% c('tar', {
tar_src => [ project ],
tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'),
}) %]
[% END %]
# vim: filetype=yaml sw=2
filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
version: 61.0.10
git_hash: 2478bcf2b48d1867b01e8b7df4f86a69d564d49a # v61.0.10
git_url: https://github.com/mozilla/application-services
var:
container:
use_container: 1
# This should be updated when the list of gradle dependencies is changed.
gradle_dependencies_version: 1
# This should be updated when the list of rust dependencies is changed.
rust_vendor_version: 1
# For armv7 we need a different target than the default one we use for
# GeckoView. We set this variable so the Rust project in the `input_files`
# below can set the correct target when built for use in this project,
# querying `origin_project`.
application_services: 1
# Switch to make it easier to grab all dependencies during a dry-run.
fetch_gradle_dependencies: 0
input_files:
- project: container-image
- project: '[% c("var/compiler") %]'
name: '[% c("var/compiler") %]'
- project: fenix-rust
name: rust-armv7
target_prepend:
- torbrowser-android-armv7
- project: fenix-rust
name: rust-aarch64
target_prepend:
- torbrowser-android-aarch64
- project: fenix-rust
name: rust-x86
target_prepend:
- torbrowser-android-x86
- project: fenix-rust
name: rust-x86_64
target_prepend:
- torbrowser-android-x86_64
- project: nss
name: nss-armv7
target_prepend:
- torbrowser-android-armv7
- project: nss
name: nss-aarch64
target_prepend:
- torbrowser-android-aarch64
- project: nss
name: nss-x86
target_prepend:
- torbrowser-android-x86
- project: nss
name: nss-x86_64
target_prepend:
- torbrowser-android-x86_64
- project: sqlcipher
name: sqlcipher-armv7
target_prepend:
- torbrowser-android-armv7
- project: sqlcipher
name: sqlcipher-aarch64
target_prepend:
- torbrowser-android-aarch64
- project: sqlcipher
name: sqlcipher-x86
target_prepend:
- torbrowser-android-x86
- project: sqlcipher
name: sqlcipher-x86_64
target_prepend:
- torbrowser-android-x86_64
- filename: 'gradle-dependencies-[% c("var/gradle_dependencies_version") %]'
name: gradle-dependencies
exec: '[% INCLUDE "fetch-gradle-dependencies" %]'
enable: '[% !c("var/fetch_gradle_dependencies") %]'
# `cargo vendor vendor` in the `application-services` directory has vendored
# the sources.
- URL: https://people.torproject.org/~gk/mirrors/sources/application-services-vendor-[% c('var/rust_vendor_version') %].tar.bz2
sha256sum: fd90572db453b5d83bc7dbb50b09d75c5019f09ee747054fdc12f42605d9da69
- filename: no-git.patch
- filename: mavenLocal.patch
enable: '[% !c("var/fetch_gradle_dependencies") %]'
- filename: target.patch
- filename: 1651660.patch
From 1eed35b66ea9d943d6ea648649b0012e132f3602 Mon Sep 17 00:00:00 2001
From: Georg Koppen <gk@torproject.org>
Date: Thu, 2 Jul 2020 20:34:23 +0000
Subject: [PATCH] Use local maven repository for gradle dependencies
diff --git a/build.gradle b/build.gradle
index 4715a7cd..1e71ca04 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,6 +17,7 @@ buildscript {
]
repositories {
+ mavenLocal()
google()