Unverified Commit 68c652e1 authored by Georg Koppen's avatar Georg Koppen
Browse files

Bug 40078: Include Gradle 6.5.1 and use it for fenix

parent 97879e51
...@@ -15,11 +15,13 @@ unzip -qq [% c("input_files_by_name/android_sdk_tools") %] -d $SDK_HOME ...@@ -15,11 +15,13 @@ 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 unzip -qq [% c("input_files_by_name/android_ndk_compiler")%] -d $NDK_HOME
# GeckoView is still using an older Android NDK, bundle it, too. # 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/android_ndk_compiler_old")%] -d $NDK_HOME
unzip -qq [% c("input_files_by_name/gradle_bin") %] -d $GRADLE_HOME unzip -qq [% c("input_files_by_name/gradle564") %] -d $GRADLE_HOME
# GeckoView is still using an older Gradle, bundle it, too. # GeckoView is still using an older Gradle, bundle it, too.
unzip -qq [% c("input_files_by_name/gradle_bin_old") %] -d $GRADLE_HOME unzip -qq [% c("input_files_by_name/gradle511") %] -d $GRADLE_HOME
# application-services is using a comparatively new Gradle, bundle it, too. # application-services is using a comparatively new Gradle, bundle it, too.
unzip -qq [% c("input_files_by_name/gradle_bin_new") %] -d $GRADLE_HOME unzip -qq [% c("input_files_by_name/gradle63") %] -d $GRADLE_HOME
# Fenix switched to a fairly recent Gradle, add it as well.
unzip -qq [% c("input_files_by_name/gradle651") %] -d $GRADLE_HOME
# NDK Archive # NDK Archive
for version in [% c("var/android_ndk_version") %][% c("var/android_ndk_revision") %] [% c("var/android_ndk_version_old") %]; do for version in [% c("var/android_ndk_version") %][% c("var/android_ndk_revision") %] [% c("var/android_ndk_version_old") %]; do
......
...@@ -19,16 +19,17 @@ var: ...@@ -19,16 +19,17 @@ var:
export GRADLE_HOME=/var/tmp/dist/[% project %]/gradle export GRADLE_HOME=/var/tmp/dist/[% project %]/gradle
export ANDROID_HOME=$ANDROID_SDK_HOME export ANDROID_HOME=$ANDROID_SDK_HOME
export GRADLE_USER_HOME=$GRADLE_HOME export GRADLE_USER_HOME=$GRADLE_HOME
export PATH=$PATH:$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin:$GRADLE_HOME/gradle-[% c("var/gradle_version") %]/bin export PATH=$PATH:$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin:$GRADLE_HOME/gradle-[% c("var/gradle564") %]/bin
google_repo: https://dl.google.com/android/repository google_repo: https://dl.google.com/android/repository
android_api_level: 29 android_api_level: 29
android_platform_revision: 04 android_platform_revision: 04
android_ndk_version: 21 android_ndk_version: 21
android_ndk_version_old: 20 android_ndk_version_old: 20
android_ndk_revision: d android_ndk_revision: d
gradle_version_new: 6.3 gradle651: 6.5.1
gradle_version: 5.6.4 gradle63: 6.3
gradle_version_old: 5.1.1 gradle564: 5.6.4
gradle511: 5.1.1
input_files: input_files:
- project: container-image - project: container-image
- URL: '[% c("var/google_repo") %]/build-tools_r[% c("version") %]-linux.zip' - URL: '[% c("var/google_repo") %]/build-tools_r[% c("version") %]-linux.zip'
...@@ -55,12 +56,15 @@ input_files: ...@@ -55,12 +56,15 @@ input_files:
- URL: '[% c("var/google_repo") %]/android-ndk-r[% c("var/android_ndk_version_old") %]-linux-x86_64.zip' - URL: '[% c("var/google_repo") %]/android-ndk-r[% c("var/android_ndk_version_old") %]-linux-x86_64.zip'
name: android_ndk_compiler_old name: android_ndk_compiler_old
sha256sum: 57435158f109162f41f2f43d5563d2164e4d5d0364783a9a6fab3ef12cb06ce0 sha256sum: 57435158f109162f41f2f43d5563d2164e4d5d0364783a9a6fab3ef12cb06ce0
- URL: https://services.gradle.org/distributions/gradle-[% c("var/gradle_version_new") %]-bin.zip - URL: https://services.gradle.org/distributions/gradle-[% c("var/gradle651") %]-bin.zip
name: gradle_bin_new name: gradle651
sha256sum: 50a7d30529fa939721fe9268a0205142f3f2302bcac5fb45b27a3902e58db54a
- URL: https://services.gradle.org/distributions/gradle-[% c("var/gradle63") %]-bin.zip
name: gradle63
sha256sum: 038794feef1f4745c6347107b6726279d1c824f3fc634b60f86ace1e9fbd1768 sha256sum: 038794feef1f4745c6347107b6726279d1c824f3fc634b60f86ace1e9fbd1768
- URL: https://services.gradle.org/distributions/gradle-[% c("var/gradle_version") %]-bin.zip - URL: https://services.gradle.org/distributions/gradle-[% c("var/gradle564") %]-bin.zip
name: gradle_bin name: gradle564
sha256sum: 1f3067073041bc44554d0efe5d402a33bc3d3c93cc39ab684f308586d732a80d sha256sum: 1f3067073041bc44554d0efe5d402a33bc3d3c93cc39ab684f308586d732a80d
- URL: https://services.gradle.org/distributions/gradle-[% c("var/gradle_version_old") %]-bin.zip - URL: https://services.gradle.org/distributions/gradle-[% c("var/gradle511") %]-bin.zip
name: gradle_bin_old name: gradle511
sha256sum: 4953323605c5d7b89e97d0dc7779e275bccedefcdac090aec123375eae0cc798 sha256sum: 4953323605c5d7b89e97d0dc7779e275bccedefcdac090aec123375eae0cc798
...@@ -31,7 +31,7 @@ cp $rootdir/[% c('input_files_by_name/topl') %]/* app/ ...@@ -31,7 +31,7 @@ cp $rootdir/[% c('input_files_by_name/topl') %]/* app/
cp $rootdir/[% c('input_files_by_name/tor-android-service') %]/* app/ cp $rootdir/[% c('input_files_by_name/tor-android-service') %]/* app/
[% IF c("var/fetch_gradle_dependencies") %] [% IF c("var/fetch_gradle_dependencies") %]
gradle --debug --no-daemon app:assemble[% c('variant') %] -x lint $GRADLE_HOME/gradle-6.5.1/bin/gradle --debug --no-daemon app:assemble[% c('variant') %] -x lint
[% ELSE %] [% ELSE %]
# Prepare Glean dependencies for offline build # Prepare Glean dependencies for offline build
tar -xjf $rootdir/glean-parser-[% c('var/glean_parser') %].tar.bz2 tar -xjf $rootdir/glean-parser-[% c('var/glean_parser') %].tar.bz2
...@@ -45,7 +45,7 @@ cp $rootdir/[% c('input_files_by_name/tor-android-service') %]/* app/ ...@@ -45,7 +45,7 @@ cp $rootdir/[% c('input_files_by_name/tor-android-service') %]/* app/
# not only for geckoview-beta. # not only for geckoview-beta.
cp -f $distdir/geckoview/*.aar $gradle_repo/org/mozilla/geckoview/geckoview-beta/$geckoview_version/geckoview-beta-$geckoview_version.aar cp -f $distdir/geckoview/*.aar $gradle_repo/org/mozilla/geckoview/geckoview-beta/$geckoview_version/geckoview-beta-$geckoview_version.aar
gradle --offline --no-daemon -Dmaven.repo.local=$gradle_repo app:assemble[% c('variant') %] -x lint $GRADLE_HOME/gradle-6.5.1/bin/gradle --offline --no-daemon -Dmaven.repo.local=$gradle_repo app:assemble[% c('variant') %] -x lint
# XXX We need the build variant in lower case. Do something smarter here. # XXX We need the build variant in lower case. Do something smarter here.
v=[% c("variant") %] v=[% c("variant") %]
cp app/build/outputs/apk/${v,}/*.apk $distdir/[% project %] cp app/build/outputs/apk/${v,}/*.apk $distdir/[% project %]
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment