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

Bug 40373: Update components for mozilla93: geckoview part

parent c2062d73

projects/android-toolchain/build

+3 −0
Original line number Diff line number Diff line
@@ -12,6 +12,9 @@ mkdir -p $NDK_HOME $SDK_HOME 


# Compiler Archives

unzip -qq [% c("input_files_by_name/android_sdk_tools") %] -d $SDK_HOME

mkdir -p $SDK_HOME/cmdline-tools

unzip -qq [% c("input_files_by_name/android_commandlinetools") %] -d $SDK_HOME/cmdline-tools

mv $SDK_HOME/cmdline-tools/cmdline-tools $SDK_HOME/cmdline-tools/[% c("var/commandlinetools_version_string") %]

unzip -qq [% c("input_files_by_name/android_ndk_compiler")%] -d $NDK_HOME



# NDK Archive

projects/android-toolchain/config

+9 −0
Original line number Diff line number Diff line
@@ -33,7 +33,13 @@ var: 
  android_platform_revision_29: 04

  android_ndk_version: 21

  android_ndk_revision: d

  # XXX: In commit 83fffa1198c3cbeffec45028971896876e2133a5 mozilla

  # replaced sdk-tools with commandlinetools. We try to do the same here,

  # but it seems sdk-tools is still being used in the build, so we can't

  # remove sdk-tools yet.

  sdk_tools_version: 4333796

  commandlinetools_version: 7302050

  commandlinetools_version_string: 4.0

input_files:

  - project: container-image

  - URL: '[% c("var/google_repo") %]/build-tools_r[% c("var/version_30") %]-linux.zip'
@@ -60,6 +66,9 @@ input_files: 
  - URL: '[% c("var/google_repo") %]/sdk-tools-linux-[% c("var/sdk_tools_version") %].zip'

    name: android_sdk_tools

    sha256sum: 92ffee5a1d98d856634e8b71132e8a95d96c83a63fde1099be3d86df3106def9

  - URL: '[% c("var/google_repo") %]/commandlinetools-linux-[% c("var/commandlinetools_version") %]_latest.zip'

    name: android_commandlinetools

    sha256sum: 7a00faadc0864f78edd8f4908a629a46d622375cbe2e5814e82934aebecdb622

  - URL: '[% c("var/google_repo") %]/android-ndk-r[% c("var/android_ndk_version") %][% c("var/android_ndk_revision") %]-linux-x86_64.zip'

    name: android_ndk_compiler

    sha256sum: dd6dc090b6e2580206c64bcee499bc16509a5d017c6952dcd2bed9072af67cbd

projects/geckoview/build

+3 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ fi 


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

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

export GRADLE_MAVEN_REPOSITORIES="file://$gradle_repo"

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

export GRADLE_FLAGS="--no-daemon --offline"

# 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
@@ -50,6 +50,8 @@ rm -f js/src/configure 


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

export MACH_USE_SYSTEM_PYTHON=1

# Create .mozbuild to avoid interactive prompt in configure

mkdir "$HOME/.mozbuild"

./mach configure --with-tor-browser-version=[% c("var/torbrowser_version") %]

./mach build --verbose

projects/geckoview/config

+6 −4
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ git_submodule: 1 
gpg_keyring: torbutton.gpg



var:

  geckoview_version: 92.0

  geckoview_version: 93.0

  torbrowser_branch: 11.0

  copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]'

  deps:
@@ -23,8 +23,8 @@ var: 
  container:

    use_container: 1

  # this should be updated when the list of gradle dependencies is changed

  gradle_dependencies_version: 6

  gradle_version: 5.1.1

  gradle_dependencies_version: 7

  gradle_version: 6.9.1



steps:

  merge_aars:
@@ -74,13 +74,15 @@ steps: 


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

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

      export GRADLE_MAVEN_REPOSITORIES="file://$gradle_repo"

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

      export GRADLE_FLAGS="--no-daemon --offline"

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

      cp -r $gradle_repo/m2/* $gradle_repo



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

      export MACH_USE_SYSTEM_PYTHON=1

      # Create .mozbuild to avoid interactive prompt in configure

      mkdir "$HOME/.mozbuild"

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

      ./mach configure --with-tor-browser-version=[% c("var/torbrowser_version") %]

      ./mach build --verbose

projects/geckoview/gradle-dependencies-list.txt

+443 −336

File changed.

Preview size limit exceeded, changes collapsed.