Verified Commit 8c7df73a authored by boklm's avatar boklm Committed by aguestuser
Browse files

Bug 40368: Use system's python3 for android builds

parent a893611f

projects/android-components/build

+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ cat > get-moz-build-date << "EOF" 
EOF



[% IF !c("var/fetch_gradle_dependencies") %]

  [% pc('python', 'var/setup', { python_tarfile => c('input_files_by_name/python') }) %]

  tar -C $distdir -xf [% c('input_files_by_name/geckoview') %]

  gradle_repo=$rootdir/[% c('input_files_by_name/gradle-dependencies') %]

  # This overwrites the release, beta, and nightly geckoview .aar files in our

projects/android-components/config

+4 −5
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ var: 
  gradle_version: 6.6.1

  glean_parser: 3.4.0

  git_branch: '[% project %]-[% c("var/android_components_version") %]-[% c("var/torbrowser_branch") %]-1'

  arch_deps:

    - python3-venv



targets:

  nightly:
@@ -39,9 +41,6 @@ input_files: 
  - name: application-services

    project: application-services

    enable: '[% !c("var/fetch_gradle_dependencies") %]'

  - name: python

    project: python

    enable: '[% !c("var/fetch_gradle_dependencies") %]'

  - filename: 'gradle-dependencies-[% c("var/gradle_dependencies_version") %]'

    name: gradle-dependencies

    exec: '[% INCLUDE "fetch-gradle-dependencies" %]'
@@ -49,9 +48,9 @@ input_files: 
  - filename: git.patch

  - filename: mavenLocal.patch

    enable: '[% !c("var/fetch_gradle_dependencies") %]'

  - URL: https://people.torproject.org/~boklm/mirrors/sources/glean-wheels-[% c('var/glean_parser') %].tar.xz

  - URL: https://people.torproject.org/~boklm/mirrors/sources/glean-wheels-[% c('var/glean_parser') %]-build2.tar.xz

    name: glean

    sha256sum: b74c9184dd2ee4c84a6e9766cd754cd07fc9be7233a1cdaa35bba6bd169beb75

    sha256sum: 6bbf3a9ffa939ca87e00b486f2020ab5cf9dea772f1d37b048f666fed38f98c1

    enable: '[% !c("var/fetch_gradle_dependencies") %]'

  - filename: gen_gradle_deps_file.sh

    enable: '[% c("var/fetch_gradle_dependencies") %]'

projects/application-services/build

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ cd $rootdir 
export JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-amd64



[% IF !c('var/fetch_gradle_dependencies') %]

  [% pc('python', 'var/setup', { python_tarfile => c('input_files_by_name/python') }) %]

  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
@@ -75,6 +74,7 @@ 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

export RUST_ANDROID_GRADLE_PYTHON_COMMAND=python3

[% 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.
@@ -83,7 +83,7 @@ patch -p1 < $rootdir/target.patch 
  mv gradle-dependencies-list.txt '[% dest_dir _ "/" _ c("filename") %]'

[% ELSE %]

  # Prepare Glean dependencies for offline build

  tar -xf $rootdir/glean-wheels-[% c('var/glean_parser') %].tar.xz

  tar -xf $rootdir/[% c('input_files_by_name/glean-wheels') %]

  # We need to set `LC_ALL` and `LANG` to something that is not ASCII as encoding

  # otherwise `click` barfs. See: https://click.palletsprojects.com/python3/

  export LC_ALL=C.UTF-8

projects/application-services/config

+5 −5
Original line number Diff line number Diff line
@@ -12,6 +12,8 @@ var: 
  gradle_dependencies_version: 6

  gradle_version: 6.5

  glean_parser: 2.2.0

  arch_deps:

    - python3-venv



input_files:

  - project: container-image
@@ -68,15 +70,13 @@ input_files: 
    pkg_type: build

    target_prepend:

      - android-x86_64

  - name: python

    project: python

    enable: '[% !c("var/fetch_gradle_dependencies") %]'

  - filename: 'gradle-dependencies-[% c("var/gradle_dependencies_version") %]'

    name: gradle-dependencies

    exec: '[% INCLUDE "fetch-gradle-dependencies" %]'

    enable: '[% !c("var/fetch_gradle_dependencies") %]'

  - URL: https://people.torproject.org/~boklm/mirrors/sources/glean-wheels-[% c('var/glean_parser') %].tar.xz

    sha256sum: 24ceaaadaf155445e8ad135173d894e05c0745b41ab5fee150f9548550acf2a6

  - URL: https://people.torproject.org/~boklm/mirrors/sources/glean-wheels-[% c('var/glean_parser') %]-build2.tar.xz

    name: glean-wheels

    sha256sum: 75107e7f84152806fde2070d1830174919a7a2ef54c774a1925a92dd4e20d0f7

    enable: '[% !c("var/fetch_gradle_dependencies") %]'

  # Use `make cargo_vendor-application-services` to re-generate the vendor tarball

  - URL: https://people.torproject.org/~boklm/mirrors/sources/application-services-vendor-[% c('version') %].tar.bz2

projects/fenix/build

+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ cat > get-moz-build-date << "EOF" 
EOF



[% IF !c("var/fetch_gradle_dependencies") %]

  [% pc('python', 'var/setup', { python_tarfile => c('input_files_by_name/python') }) %]

  tar -C $distdir -xf [% c('input_files_by_name/geckoview') %]

  gradle_repo=$rootdir/[% c('input_files_by_name/gradle-dependencies') %]

  # This overwrites the release, beta, and nightly geckoview .aar files in our