Commit df9fb962 authored by boklm's avatar boklm Committed by Matthew Finkel
Browse files

Bug 40172: Simplify gradle's project support for mutliple versions

parent a3d1c8a8

projects/android-components/build

+0 −3
Original line number Diff line number Diff line
@@ -7,9 +7,6 @@ mkdir $distdir/[% project %] 
mkdir /var/tmp/build



tar -C $GRADLE_HOME -xf $rootdir/[% c('input_files_by_name/gradle') %]

# XXX: Not needed once we are done with moving Gradle out of our toolchain

# project.

export PATH=$GRADLE_HOME/gradle/bin:$PATH



cat > get-moz-build-date << "EOF"

[% INCLUDE "get-moz-build-date" %]

projects/android-components/config

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ var: 
  # Switch to make it easier to grab all dependencies during a dry-run.

  # Note: Use the commit before support for new GeckoView interfaces gets added.

  fetch_gradle_dependencies: 0

  gradle_version: 6.6.1



targets:

  nightly:

projects/android-toolchain/config

+7 −1
Original line number Diff line number Diff line
@@ -19,7 +19,13 @@ var: 
    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/toolchains/llvm/prebuilt/linux-x86_64/bin:$GRADLE_HOME/gradle-[% c("var/gradle564") %]/bin

    # In the PATH we set $GRADLE_HOME/gradle/bin (not included in

    # android-toolchain) before $GRADLE_HOME/gradle-[% c("var/gradle564") %]/bin

    # (which is included in android-toolchain)).

    #

    # Project which need a specific gradle version can use the gradle

    # project and extract it in $GRADLE_HOME/gradle/bin

    export PATH=$PATH:$ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin:$GRADLE_HOME/gradle/bin:$GRADLE_HOME/gradle-[% c("var/gradle564") %]/bin

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

  android_api_level: 29

  android_platform_revision: 04

projects/application-services/build

+0 −3
Original line number Diff line number Diff line
@@ -7,9 +7,6 @@ mkdir $distdir 
mkdir /var/tmp/build



tar -C $GRADLE_HOME -xf $rootdir/[% c('input_files_by_name/gradle') %]

# XXX: Not needed once we are done with moving Gradle out of our toolchain

# project.

export PATH=$GRADLE_HOME/gradle/bin:$PATH

cd /var/tmp/dist

[% FOREACH arch = ['armv7', 'aarch64', 'x86', 'x86_64'] -%]

  tar -xf $rootdir/[% c('input_files_by_name/nss-' _ arch) %]

projects/application-services/config

+1 −5
Original line number Diff line number Diff line
@@ -12,15 +12,11 @@ var: 
  gradle_dependencies_version: 4

  # This should be updated when the list of rust dependencies is changed.

  rust_vendor_version: 3

  # 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

  # application-services is still stuck on an older glean_parser version.

  glean_parser: 1.28.6

  gradle_version: 6.5



input_files:

  - project: container-image