Verified Commit a38be5d2 authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame 🎃
Browse files

Bug 41211: Share parts of the GeckoView build files. 

GeckoView is built in two steps (build to create the arch-specific
.aars and build_apk to build the Kotlin code).
However, they share big chunks of build code, therefore we always risk
to forget to update one of the two.
So, in this commit we move the duplicate parts in a shared preamble
file.
parent 2fb90e5f

projects/geckoview/build

+2 −39
Original line number Diff line number Diff line 
#!/bin/bash

[% 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"),

  }) %]

distdir=/var/tmp/dist

mkdir -p /var/tmp/build

mkdir -p $distdir

[% INCLUDE 'build_common' %]



tar -C /var/tmp/dist -xf [% c('input_files_by_name/rust') %]

tar -C /var/tmp/dist -xf [% c('input_files_by_name/cbindgen') %]

tar -C /var/tmp/dist -xf [% c('input_files_by_name/nasm') %]

tar -C /var/tmp/dist -xf [% c('input_files_by_name/node') %]

tar -C /var/tmp/dist -xf [% c('input_files_by_name/clang') %]

export LLVM_CONFIG="/var/tmp/dist/clang/bin/llvm-config"

tar -C /var/tmp/dist -xf [% c('input_files_by_name/llvm-runtimes') %]

cp -r /var/tmp/dist/llvm-runtimes/* /var/tmp/dist/clang/

tar -C /var/tmp/dist -xf [% c('input_files_by_name/binutils') %]

export PATH="/var/tmp/dist/rust/bin:/var/tmp/dist/cbindgen:/var/tmp/dist/nasm/bin:/var/tmp/dist/node/bin:/var/tmp/dist/clang/bin:/var/tmp/dist/binutils/bin:$PATH"

export PATH="/var/tmp/dist/rust/bin:/var/tmp/dist/cbindgen:/var/tmp/dist/nasm/bin:/var/tmp/dist/clang/bin:/var/tmp/dist/binutils/bin:$PATH"



[% IF c("var/rlbox") -%]

  tar -C /var/tmp/dist -xf [% c('input_files_by_name/wasi-sysroot') %]
@@ -31,13 +23,6 @@ export PATH="/var/tmp/dist/rust/bin:/var/tmp/dist/cbindgen:/var/tmp/dist/nasm/bi 
  export WASI_SYSROOT=/var/tmp/dist/wasi-sysroot/share/wasi-sysroot

[% END -%]



tar -xf [% c('input_files_by_name/application-services') %]

export NIMBUS_FML=$rootdir/application-services/nimbus-fml



[% INCLUDE 'fake-git' %]



tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.[% c('compress_tar') %]



cd /var/tmp/build/[% project %]-[% c("version") %]

cat > .mozconfig << 'MOZCONFIG_EOF'

. $topsrcdir/mozconfig-[% c("var/osname") %]
@@ -50,28 +35,6 @@ export MOZ_SOURCE_CHANGESET=[% c("var/git_commit") %] 
ac_add_options --enable-update-channel=[% c("var/variant") %]

MOZCONFIG_EOF



[% c("var/set_MOZ_BUILD_DATE") %]



export JAVA_HOME=/usr/lib/jvm/java-1.17.0-openjdk-amd64

gradle_repo=/var/tmp/dist/gradle-dependencies

export GRADLE_MAVEN_REPOSITORIES="file://$gradle_repo","file://$gradle_repo/maven2"

# Set the Maven local repository because Gradle ignores our overriding of $HOME.

# It is only used for the local pubblication of single-arch AARs.

export GRADLE_FLAGS="--no-daemon --offline -Dmaven.repo.local=$distdir/[% project %]"

# Move the Gradle repo to a hard-coded location. The location is embedded in

# the file chrome/toolkit/content/global/buildconfig.html so it needs to be

# standardized for reproducibility.

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

cp -rl $rootdir/application-services/maven/* $gradle_repo

cp -rl $gradle_repo/dl/android/maven2/* $gradle_repo || true

cp -rl $gradle_repo/m2/* $gradle_repo || true

cp -rl $gradle_repo/maven2/* $gradle_repo || true



# We unbreak mach, see: https://bugzilla.mozilla.org/show_bug.cgi?id=1656993 and https://bugzilla.mozilla.org/show_bug.cgi?id=1755516

export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system

# Create .mozbuild to avoid interactive prompt in configure

mkdir "$HOME/.mozbuild"



echo "Starting ./mach configure $(date)"

./mach configure \

  --with-base-browser-version=[% c("var/torbrowser_version") %] \

projects/geckoview/build_apk

+1 −36
Original line number Diff line number Diff line 
#!/bin/bash

[% 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"),

}) %]

distdir=/var/tmp/dist

builddir=/var/tmp/build

mkdir -p $builddir $distdir



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

export PATH="/var/tmp/dist/node/bin:$PATH"

[% INCLUDE 'build_common' %]



tar -C $distdir -xf $rootdir/[% c('input_files_by_name/translation-fenix') %]



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

export GLEAN_PYTHON_WHEELS_DIR=$rootdir/glean-wheels



tar -xf [% c('input_files_by_name/application-services') %]

export NIMBUS_FML=$rootdir/application-services/nimbus-fml



[% INCLUDE 'fake-git' %]



tar -C $builddir -xf [% c('input_files_by_name/geckoview_armv7') %]

tar -C $builddir -xf [% c('input_files_by_name/geckoview_aarch64') %]

tar -C $builddir -xf [% c('input_files_by_name/geckoview_x86') %]
@@ -44,23 +29,6 @@ export MOZ_SOURCE_REPO="[% c('var/gitlab_project') %]" 
export MOZ_SOURCE_CHANGESET=[% c("var/git_commit") %]

MOZCONFIG_EOF



[% c("var/set_MOZ_BUILD_DATE") %]



export JAVA_HOME=/usr/lib/jvm/java-1.17.0-openjdk-amd64

gradle_repo=/var/tmp/dist/gradle-dependencies

export GRADLE_MAVEN_REPOSITORIES="file://$gradle_repo","file://$gradle_repo/maven2"

export GRADLE_FLAGS="--no-daemon --offline -Dmaven.repo.local=$distdir/[% project %]"

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

cp -rl $rootdir/application-services/maven/* $gradle_repo

cp -rl $gradle_repo/dl/android/maven2/* $gradle_repo || true

cp -rl $gradle_repo/m2/* $gradle_repo || true

cp -rl $gradle_repo/maven2/* $gradle_repo || true



# We unbreak mach, see: https://bugzilla.mozilla.org/show_bug.cgi?id=1656993.

export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system

# Create .mozbuild to avoid interactive prompt in configure

mkdir "$HOME/.mozbuild"



[% IF c("var/has_l10n") -%]

  supported_locales="[% tmpl(c('var/locales_mobile').join(' ')).replace('-r', '-').replace('in', 'id').replace('iw', 'he') %]"

  l10ncentral="$HOME/.mozbuild/l10n-central"
@@ -73,9 +41,6 @@ mkdir "$HOME/.mozbuild" 
  # through GeckoView.

[% END -%]



export LC_ALL=C.UTF-8

export LANG=C.UTF-8



# We still need to specify --tor-browser-version due to bug 34005.

./mach configure \

  --with-base-browser-version=[% c("var/torbrowser_version") %] \

projects/geckoview/build_common

0 → 100644
+43 −0
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"),

}) %]

distdir=/var/tmp/dist

builddir=/var/tmp/build

mkdir -p $builddir $distdir



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

export PATH="/var/tmp/dist/node/bin:$PATH"



export LC_ALL=C.UTF-8

export LANG=C.UTF-8



tar -xf [% c('input_files_by_name/application-services') %]

export NIMBUS_FML=$rootdir/application-services/nimbus-fml



[% INCLUDE 'fake-git' %]



tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.[% c('compress_tar') %]



[% c("var/set_MOZ_BUILD_DATE") %]



export JAVA_HOME=/usr/lib/jvm/java-1.17.0-openjdk-amd64

gradle_repo=/var/tmp/dist/gradle-dependencies

export GRADLE_MAVEN_REPOSITORIES="file://$gradle_repo","file://$gradle_repo/maven2"

# Set the Maven local repository because Gradle ignores our overriding of $HOME.

# It is only used for the local pubblication of single-arch AARs.

export GRADLE_FLAGS="--no-daemon --offline -Dmaven.repo.local=$distdir/[% project %]"

# Move the Gradle repo to a hard-coded location. The location is embedded in

# the file chrome/toolkit/content/global/buildconfig.html so it needs to be

# standardized for reproducibility.

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

cp -rl $rootdir/application-services/maven/* $gradle_repo

cp -rl $gradle_repo/dl/android/maven2/* $gradle_repo || true

cp -rl $gradle_repo/m2/* $gradle_repo || true

cp -rl $gradle_repo/maven2/* $gradle_repo || true



# We unbreak mach, see: https://bugzilla.mozilla.org/show_bug.cgi?id=1656993.

export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system

# Create .mozbuild to avoid interactive prompt in configure

mkdir "$HOME/.mozbuild"