commit d5208061c55f6f987917f6a179469c4b559c8838 Author: aguestuser aguestuser@torproject.org Date: Thu Feb 10 16:57:53 2022 -0500
Bug 40418: Update components for mozilla96: geckoview part --- projects/geckoview/build | 2 +- projects/geckoview/config | 6 ++-- projects/geckoview/gradle-dependencies-list.txt | 37 +++++++++++++++++++++---- projects/llvm-project/config | 18 +++++++++--- 4 files changed, 49 insertions(+), 14 deletions(-)
diff --git a/projects/geckoview/build b/projects/geckoview/build index 3f7264a..b83a3e3 100644 --- a/projects/geckoview/build +++ b/projects/geckoview/build @@ -52,7 +52,7 @@ rm -f js/src/configure 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 configure --with-tor-browser-version=[% c("var/torbrowser_version") %] --with-java-bin-path="$JAVA_HOME/bin" --without-wasm-sandboxed-libraries ./mach build --verbose
# We don't want to have the debug .aar but the one that has `$channel`, `$arch`, diff --git a/projects/geckoview/config b/projects/geckoview/config index 4911f81..4969ece 100644 --- a/projects/geckoview/config +++ b/projects/geckoview/config @@ -8,7 +8,7 @@ git_submodule: 1 gpg_keyring: torbutton.gpg
var: - geckoview_version: 94.0 + geckoview_version: 96.0 torbrowser_branch: 11.5 copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' deps: @@ -23,7 +23,7 @@ var: container: use_container: 1 # this should be updated when the list of gradle dependencies is changed - gradle_dependencies_version: 8 + gradle_dependencies_version: 9 gradle_version: 6.9.1
steps: @@ -84,7 +84,7 @@ steps: # 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 configure --with-tor-browser-version=[% c("var/torbrowser_version") %] --with-java-bin-path="$JAVA_HOME/bin" --without-wasm-sandboxed-libraries ./mach build --verbose find obj-* -regex '.*geckoview.*[0-9].(aar|pom)' -exec cp {} $distdir/[% project %] ;
diff --git a/projects/geckoview/gradle-dependencies-list.txt b/projects/geckoview/gradle-dependencies-list.txt index 1a0990b..e6db32a 100644 --- a/projects/geckoview/gradle-dependencies-list.txt +++ b/projects/geckoview/gradle-dependencies-list.txt @@ -70,8 +70,6 @@ e71c328ceef5c4a7d76f2d86df1b65d65fe2acf868b1a4efd84a3f34336186d8 | https://maven a000041f5a1f79283c5175e1bb60cf3683780f401c6a9d34fbe9751253fa6ff9 | https://maven.google.com/androidx/localbroadcastmanager/localbroadcastmanage... b23b527b2bac870c4a7451e6982d7132e413e88d7f27dbeb1fc7640a720cd9ee | https://maven.google.com/androidx/media/media/1.0.0/media-1.0.0.aar 9cdfe5f7849069ad84dc4fb0407b3677fb8c22d3d66fd2b8fdb8dec8c5dc7411 | https://maven.google.com/androidx/media/media/1.0.0/media-1.0.0.pom -fb8115694b1731c23c1bbb628f5baaee37a8f3b50d69a7733b55278e101e1488 | https://maven.google.com/androidx/multidex/multidex-instrumentation/2.0.0/mu... -5056524d08992ebe1b3654c5b0db125497b930f177fa385952450e3b74d49bf2 | https://maven.google.com/androidx/multidex/multidex-instrumentation/2.0.0/mu... c01700091072e0ff5d8ec2d00eac6b8f96ea18646080425e9ce3c6a7b5f66e33 | https://maven.google.com/androidx/multidex/multidex/2.0.0/multidex-2.0.0.aar 4298222d2a10cf6e82f32650b5a716a8714899f3ef7d05d58ddaafc32ae2d614 | https://maven.google.com/androidx/multidex/multidex/2.0.0/multidex-2.0.0.pom ea9fde25606eb456210ffe9f7e51048abd776b55a34c0cc6608282b5699122d1 | https://maven.google.com/androidx/preference/preference/1.0.0/preference-1.0... @@ -243,11 +241,20 @@ fdd93302c2eb94bbe6007caa28d072246d2875cda5cb774bb6299416b94d74a6 | https://maven c9fff541d51c11195de305c50bbfe4d1dfc97841983d95f6d7101112603515ab | https://maven.google.com/com/google/android/material/material/1.0.0/material... 2deaa8c40f27c8af158ae2c2132927cd9be345deb1450da49aca29cb168289cd | https://maven.google.com/com/google/testing/platform/core-proto/0.0.8-alpha0... 501e7a6b743cf4e81643ce31e2850f37477494a689513e756e059c688773867f | https://maven.google.com/com/google/testing/platform/core-proto/0.0.8-alpha0... -440a25cd719ed1c40ee48d1ec1fb8a32193e25ddd9b7fa5bbd4e252f9cf8083d | https://plugins.gradle.org/m2/com/koushikdutta/async/androidasync/3.1.0/andr... -5d5c55f1ed2ab04d538223d23a39d78c66df4c96f87f634ad7078417b79d3372 | https://plugins.gradle.org/m2/com/koushikdutta/async/androidasync/3.1.0/andr... -f38510e048be4795658064b8735fdfa4954e54d05af875de7edc738bba326fe4 | https://plugins.gradle.org/m2/com/koushikdutta/async/androidasync/maven-meta... b4fe5dab42c4d69f50fbe67507ff58f84897670b6f54d5249c23072c881813cb | https://plugins.gradle.org/m2/org/mozilla/apilint/apilint/0.4.4/apilint-0.4.... a367da6e019475666500af411ffa3f3acee7036b1adee039dc2be21ab9ffbe5e | https://plugins.gradle.org/m2/org/mozilla/apilint/apilint/0.4.4/apilint-0.4.... +b194c0b88021cc116c21c1dc76f49c2c1fe175af5bcb74c8ba67b9dbbf9a48cc | https://repo.maven.apache.org/maven2/com/diffplug/durian/durian-collect/1.2.... +8bb762086a0a4fd2a6473bbf905c744763afa1d59a5630f73bb04b7872c09ff3 | https://repo.maven.apache.org/maven2/com/diffplug/durian/durian-collect/1.2.... +17ed0aacb3a3c16323332168bbdead8694f32800b2b47d69d4a4c49b114d5dae | https://repo.maven.apache.org/maven2/com/diffplug/durian/durian-core/1.2.0/d... +870320e90755371b01796fe81ba525fd1dee8b70346f554551eedd4289f0b662 | https://repo.maven.apache.org/maven2/com/diffplug/durian/durian-core/1.2.0/d... +095fd1dc77888c073f0be39a018156ee526722798b09de9e285ef2135e16eac4 | https://repo.maven.apache.org/maven2/com/diffplug/durian/durian-io/1.2.0/dur... +350919424324e2750a3ddc2fa1bce6a90ac8ce2925698a60a9b4d1d6e4922ffe | https://repo.maven.apache.org/maven2/com/diffplug/durian/durian-io/1.2.0/dur... +4620a92370b02d3a90f722bf0d428c503957054c5bcbe416ce5a574a01e731f6 | https://repo.maven.apache.org/maven2/com/diffplug/spotless/spotless-lib-extr... +196b4ac310e337fcc632b33b6400b6443fee41bdf968f4a529b43c696f4e3a74 | https://repo.maven.apache.org/maven2/com/diffplug/spotless/spotless-lib-extr... +712592b7dd636a901d2cb11fef37215f8a6ab2962fbfbc510ba51ae4f8ca2d6b | https://repo.maven.apache.org/maven2/com/diffplug/spotless/spotless-lib/2.19... +5f8e0fe43fe7bbb75016bd447b5d55b97556407bdc951a554589ac89fd724786 | https://repo.maven.apache.org/maven2/com/diffplug/spotless/spotless-lib/2.19... +245596e1b6294d95b8f92c575b215b532e4da246bf71fb92aea36e522d86eda3 | https://repo.maven.apache.org/maven2/com/diffplug/spotless/spotless-plugin-g... +d7dcab5d5321125d77eac07580864d1e6b3d6effbb211c2dca5fbcaf45a8a4f5 | https://repo.maven.apache.org/maven2/com/diffplug/spotless/spotless-plugin-g... 857db5645aaefbd7fbe9ba6454b072bc0518ebaba08a93d5eae89a9850e949c4 | https://repo.maven.apache.org/maven2/com/getkeepsafe/dexcount/dexcount-gradl... 15d4b252c5aa3aeb8d634ae5aaf348ac6ce183b6b5e3615364e6c083715c1133 | https://repo.maven.apache.org/maven2/com/getkeepsafe/dexcount/dexcount-gradl... 3f59eca516374ccd4fd3551625bf50f8a4b191f700508f7ce4866460a6128af0 | https://repo.maven.apache.org/maven2/com/github/gundy/semver4j/0.16.4/semver... @@ -318,11 +325,16 @@ dce7e66b32456a1b1198da0caff3a8acb71548658391e798c79369241e6490a4 | https://repo. 83f17ba86c5fa1a15a3a3c8030d4ce42ef21c1d39b65db6cc004a8eeb2c59406 | https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java/3.4.0... 6dd84a508125fffdefbd583fae12bf166aa902511b570ca54fa9efa45f6dfe80 | https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/3.1... 24909c552842c0eb7a4c769d631a43cbef5a9a10c1640f2bdbd1ea149c573a47 | https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/3.4... +04e3724984e2a5cbf55606cfa372a5bd3d3c5d2a21533a7004e3cde539761fa5 | https://repo.maven.apache.org/maven2/com/googlecode/concurrent-trees/concurr... +43c2b9b142e7055d1f2a5827f10944925d22747d9756b3250c07aab47538a971 | https://repo.maven.apache.org/maven2/com/googlecode/concurrent-trees/concurr... +3ecf8b2c602314341f5a2ace171ed04fc86f2d4ddf762180656e9b71134ae68f | https://repo.maven.apache.org/maven2/com/googlecode/javaewah/JavaEWAH/1.1.7/... +3e65dece4bd244bfb28c305a34160e7eb3811a34b31e6ff7684242dbd0d6cfdb | https://repo.maven.apache.org/maven2/com/googlecode/javaewah/JavaEWAH/1.1.7/... 2d9484f4c649f708f47f9a479465fc729770ee65617dca3011836602264f6439 | https://repo.maven.apache.org/maven2/com/googlecode/json-simple/json-simple/... 47a89be0fa0fedd476db5fd2c83487654d2a119c391f83a142be876667cf7dab | https://repo.maven.apache.org/maven2/com/googlecode/json-simple/json-simple/... 757bfe906193b8b651e79dc26cd67d6b55d0770a2cdfb0381591504f779d4a76 | https://repo.maven.apache.org/maven2/com/googlecode/juniversalchardet/junive... 7846399b35c7cd642a9b3a000c3e2d62d04eb37a4547b6933cc8b18bcc2f086b | https://repo.maven.apache.org/maven2/com/googlecode/juniversalchardet/junive... -f715b19c918900ad34be8f2e2372d97b1c5fff579a383f0b2dad9581df443ea4 | https://repo.maven.apache.org/maven2/com/koushikdutta/async/androidasync/2.2... +440a25cd719ed1c40ee48d1ec1fb8a32193e25ddd9b7fa5bbd4e252f9cf8083d | https://repo.maven.apache.org/maven2/com/koushikdutta/async/androidasync/3.1... +5d5c55f1ed2ab04d538223d23a39d78c66df4c96f87f634ad7078417b79d3372 | https://repo.maven.apache.org/maven2/com/koushikdutta/async/androidasync/3.1... 20ef4b82e43ff7c652281a21313cf3b941092467add3fa73509c26f6969efdab | https://repo.maven.apache.org/maven2/com/squareup/javapoet/1.10.0/javapoet-1... 1690340a222279f2cbadf373e88826fa20f7f3cc3ec0252f36818fed32701ab1 | https://repo.maven.apache.org/maven2/com/squareup/javapoet/1.10.0/javapoet-1... f699823d0081f69cbb676c1845ea222e0ada79bc88a53e5d22d8bd02d328f57e | https://repo.maven.apache.org/maven2/com/squareup/javawriter/2.1.1/javawrite... @@ -446,6 +458,10 @@ f23376b58ed795f2ff47426ac76b996d49e3918442e5d8713e3925f889a77799 | https://repo. 6b87237de8c2e1740cf80627c7f3ce3e15de1930bb250c55a1eca94fa3e014df | https://repo.maven.apache.org/maven2/org/codehaus/codehaus-parent/4/codehaus... 51d6c4e71782e85674239189499854359d380fb75e1a703756e3aaa5b98a5af0 | https://repo.maven.apache.org/maven2/org/codehaus/groovy/groovy-all/2.4.15/g... fc0d535d7bdb7ca90562321c2e8e2a35c377f113c6dd0b2062282e1f4676367a | https://repo.maven.apache.org/maven2/org/codehaus/groovy/groovy-all/2.4.15/g... +2bcecd848caed3975358a5c556aa49154b2d66f0c8a5c17043dd7b7d8985b6fe | https://repo.maven.apache.org/maven2/org/codehaus/groovy/groovy-xml/3.0.9/gr... +148cf4b57b6aa3feb5259a3bf25b2884a6c06b313fc58838d76acd0ba2d3da2d | https://repo.maven.apache.org/maven2/org/codehaus/groovy/groovy-xml/3.0.9/gr... +77bf86897f295f8cae2e1f46b1eca109f487ba81b66ef24a2b6dcba1eb7d6ce7 | https://repo.maven.apache.org/maven2/org/codehaus/groovy/groovy/3.0.9/groovy... +3e26864c233e00441d0eadfd82fb95abbcbec516b8e9512bc5c5e94be846dcff | https://repo.maven.apache.org/maven2/org/codehaus/groovy/groovy/3.0.9/groovy... 2068320bd6bad744c3673ab048f67e30bef8f518996fa380033556600669905d | https://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-annota... 1879f19a05991e3ed95910b96689333396b0c467a215dc4d1f90018404b72a26 | https://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-annota... 47f05852b48ee9baefef80fa3d8cea60efa4753c0013121dd7fe5eef2e5c729d | https://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-annota... @@ -456,6 +472,9 @@ f51550a06b1410bd4962cb0e71df0b921a60a7ef47bfa9c4825a14be72316eea | https://repo. f819cad1b15b6a7791c8b601e96bde33765e4681395807db4537d2f0dedd493b | https://repo.maven.apache.org/maven2/org/codehaus/mojo/mojo-parent/50/mojo-p... 7495a07a797e88e43c3bc1a87421bd8b1fc55e32291fa18e4e32d8031ddc873f | https://repo.maven.apache.org/maven2/org/eclipse/ee4j/project/1.0.2/project-... 916b4794d8d8220a59a3fdf6a64dbe794aeb23395e888b81ae36a9b5a2c591a6 | https://repo.maven.apache.org/maven2/org/eclipse/ee4j/project/1.0.5/project-... +123f2de7de449973523ed0a15d36272bee9fe635ba23932a9f046e55fcf1c1e1 | https://repo.maven.apache.org/maven2/org/eclipse/jgit/org.eclipse.jgit-paren... +b4c879e0474ae6f7fe49cf44ab9baf4eaee903f42833d311323b62f8cf335713 | https://repo.maven.apache.org/maven2/org/eclipse/jgit/org.eclipse.jgit/5.10.... +0c7eaa1081f323a70b3d3096062ce81f8a075fc06e2af6bc9c642f146dbcbb43 | https://repo.maven.apache.org/maven2/org/eclipse/jgit/org.eclipse.jgit/5.10.... a52e6850f070dc9f7a2a51d0b25dfaafd49b0b9bf8196db6c0b3c5b7c94d8d38 | https://repo.maven.apache.org/maven2/org/glassfish/jaxb/jaxb-bom/2.2.11/jaxb... a1018bb54678ed9f5acb2f7a4084e385ff510201f4e9dbf5f75dc6a675f66be7 | https://repo.maven.apache.org/maven2/org/glassfish/jaxb/jaxb-bom/2.3.2/jaxb-... 37bcaee8ebb04362c8352a5bf6221b86967ecdab5164c696b10b9a2bb587b2aa | https://repo.maven.apache.org/maven2/org/glassfish/jaxb/jaxb-core/2.2.11/jax... @@ -590,6 +609,10 @@ b88ef66468b3c978ad0c97fd6e90979e56155b4ac69089ba7a44e9aa7ffe9acf | https://repo. 83f65b1083d5ce4f8ba7f9545cfe9ff17824589c9a7cc82c3a4695801e4f5f68 | https://repo.maven.apache.org/maven2/org/ow2/asm/asm/7.0/asm-7.0.pom 51215c67d2c068d8b7d2f6f80f51372a098075deccc448d4bdd7b987ba8328fb | https://repo.maven.apache.org/maven2/org/ow2/ow2/1.3/ow2-1.3.pom 0f8a1b116e760b8fe6389c51b84e4b07a70fc11082d4f936e453b583dd50b43b | https://repo.maven.apache.org/maven2/org/ow2/ow2/1.5/ow2-1.5.pom +cdba07964d1bb40a0761485c6b1e8c2f8fd9eb1d19c53928ac0d7f9510105c57 | https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.... +7e0747751e9b67e19dcb5206f04ea22cc03d250c422426402eadd03513f2c314 | https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.... +11647956e48a0c5bfb3ac33f6da7e83f341002b6857efd335a505b687be34b75 | https://repo.maven.apache.org/maven2/org/slf4j/slf4j-parent/1.7.30/slf4j-par... +1678d4120a585d8a630131aeec4c524d928398583b7eab616ee7d5a87f520d3d | https://repo.maven.apache.org/maven2/org/sonatype/oss/oss-parent/5/oss-paren... b51f8867c92b6a722499557fc3a1fdea77bdf9ef574722fe90ce436a29559454 | https://repo.maven.apache.org/maven2/org/sonatype/oss/oss-parent/7/oss-paren... fb40265f982548212ff82e362e59732b2187ec6f0d80182885c14ef1f982827a | https://repo.maven.apache.org/maven2/org/sonatype/oss/oss-parent/9/oss-paren... 2c2a264f842498c36d34d2a7b91342490d9a962862c85baac1acd54ec2fca6d9 | https://repo.maven.apache.org/maven2/org/tensorflow/tensorflow-lite-metadata... @@ -602,3 +625,5 @@ b50d3a4ca502faa4d1c838acb8aa9480446953421f7327e338c5dda3da5e76d0 | https://repo. 138ebb33cce7080fd5cdb4fb90a0ee550173d7e8d41024da8c0d788b1460a1f3 | https://repo.maven.apache.org/maven2/xerces/xercesImpl/2.12.0/xercesImpl-2.1... a840968176645684bb01aed376e067ab39614885f9eee44abe35a5f20ebe7fad | https://repo.maven.apache.org/maven2/xml-apis/xml-apis/1.4.01/xml-apis-1.4.0... 09a82ff150ac86bfa31145e0a6afd89a02e4504785f5da112e4fae1425020e92 | https://repo.maven.apache.org/maven2/xml-apis/xml-apis/1.4.01/xml-apis-1.4.0... +5056524d08992ebe1b3654c5b0db125497b930f177fa385952450e3b74d49bf2 | https://maven.google.com/androidx/multidex/multidex-instrumentation/2.0.0/mu... +fb8115694b1731c23c1bbb628f5baaee37a8f3b50d69a7733b55278e101e1488 | https://maven.google.com/androidx/multidex/multidex-instrumentation/2.0.0/mu... diff --git a/projects/llvm-project/config b/projects/llvm-project/config index 3b99abb..646c201 100644 --- a/projects/llvm-project/config +++ b/projects/llvm-project/config @@ -4,7 +4,17 @@ git_hash: d28af7c654d8db0b68c175db5ce212d74fb5e9bc git_url: https://github.com/llvm/llvm-project filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
-targets: - android: - version: 13.0.0 - git_hash: d7b669b3a30345cfcdb2fde2af6f48aa4b94845d +# TODO (aguestuser|2022-02-10): +# - we want to use version 13.0.0 for android builds +# - BUT: we are unable to build geckoview v96.0.x if we do so, b/c `clang_rt` errors +# as per: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/merge_req... +# - for now, we revert to 12.0.0 for nightly, but plan to resolve issues using 13.0.0 +# before tagging next alpha release (11.5a5) + +######################## +# use this later! ----v +######################## +# targets: +# android: +# version: 13.0.0 +# git_hash: d7b669b3a30345cfcdb2fde2af6f48aa4b94845d
tbb-commits@lists.torproject.org
-
sysrqb＠torproject.org