Verified Commit 98e9c031 authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame 🎃 Committed by boklm
Browse files

Bug 41684: Move gradle setup back to projects/gradle/config.

parent 610c0219

projects/android-toolchain/config

+0 −6
Original line number Diff line number Diff line
@@ -22,12 +22,6 @@ var: 
    export ANDROID_NDK_ROOT=$ANDROID_NDK_HOME

    export NDK_HOST_TAG=linux-x86_64

    export PATH=$PATH:$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin

    [% IF c("gradle_tarfile") -%]

      tar -C /var/tmp/dist/[% project %] -xf $rootdir/[% c("gradle_tarfile") %]

      export GRADLE_HOME=/var/tmp/dist/[% project %]/gradle

      export GRADLE_USER_HOME=$GRADLE_HOME

      export PATH=$PATH:$GRADLE_HOME/bin

    [% END -%]

  google_repo: https://dl.google.com/android/repository

  android_release_dir: android-16

  android_ndk_release_name: '29'

projects/application-services/build

+1 −1
Original line number Diff line number Diff line
@@ -3,8 +3,8 @@ 


[% pc(c('var/compiler'), 'var/setup', {

    compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')),

    gradle_tarfile => c("input_files_by_name/gradle"),

  }) %]

[% pc('gradle', 'var/setup', { gradle_tarfile => c("input_files_by_name/gradle") }) %]

pushd /var/tmp/dist/android-toolchain/android-sdk-linux/build-tools/

unzip $rootdir/'[% c("input_files_by_name/build_tools_35") %]'

mv android-15 35.0

projects/geckoview/build_ac_fenix

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ gradle $GRADLE_FLAGS assembleGecko -x lint [% IF c('var/generate_gradle_dependen 
popd



# The build might fail with "file exists" otherwise.

rm -rf /var/tmp/dist/android-toolchain/gradle/glean/pythonenv

rm -rf $GRADLE_HOME/glean/pythonenv



echo "Building Fenix $(date)"

pushd mobile/android/fenix

projects/geckoview/build_common

+1 −1
Original line number Diff line number Diff line 
[% c("var/set_default_env") -%]

[% pc(c('var/compiler'), 'var/setup', {

  compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')),

  gradle_tarfile => c("input_files_by_name/gradle"),

}) %]

[% pc('gradle', 'var/setup', { gradle_tarfile => c("input_files_by_name/gradle") }) %]

distdir=/var/tmp/dist

builddir=/var/tmp/build

outdir="[%  dest_dir _ '/' _ c('filename') -%]"

projects/glean/build

+1 −1
Original line number Diff line number Diff line
@@ -3,8 +3,8 @@ 


[% pc(c('var/compiler'), 'var/setup', {

  compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')),

  gradle_tarfile => c("input_files_by_name/gradle"),

}) %]

[% pc('gradle', 'var/setup', { gradle_tarfile => c("input_files_by_name/gradle") }) %]



pushd /var/tmp/dist/android-toolchain/android-sdk-linux/

cd build-tools