Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build

Commits:

21 changed files:

Changes:

  • Makefile
    ... ... @@ -26,15 +26,12 @@ torbrowser-release-android: submodule-update
    26 26 
     torbrowser-release-android-armv7: submodule-update
    27 27 
     	$(rbm) build release --target release --target browser-single-platform --target browser-android-armv7 --target torbrowser
    28 28
    29 
    -torbrowser-release-android-x86: submodule-update
    30 
    -	$(rbm) build release --target release --target browser-single-platform --target browser-android-x86 --target torbrowser
    29 
    +torbrowser-release-android-aarch64: submodule-update
    30 
    +	$(rbm) build release --target release --target browser-single-platform --target browser-android-aarch64 --target torbrowser
    31 31
    32 32 
     torbrowser-release-android-x86_64: submodule-update
    33 33 
     	$(rbm) build release --target release --target browser-single-platform --target browser-android-x86_64 --target torbrowser
    34 34
    35 
    -torbrowser-release-android-aarch64: submodule-update
    36 
    -	$(rbm) build release --target release --target browser-single-platform --target browser-android-aarch64 --target torbrowser
    37 
    -
    38 35 
     torbrowser-release-linux-x86_64: submodule-update
    39 36 
     	$(rbm) build release --target release --target browser-single-platform --target browser-linux-x86_64 --target torbrowser
    40 37
    ... ... @@ -68,15 +65,12 @@ torbrowser-alpha-android: submodule-update
    68 65 
     torbrowser-alpha-android-armv7: submodule-update
    69 66 
     	$(rbm) build release --target alpha --target browser-single-platform --target browser-android-armv7 --target torbrowser
    70 67
    71 
    -torbrowser-alpha-android-x86: submodule-update
    72 
    -	$(rbm) build release --target alpha --target browser-single-platform --target browser-android-x86 --target torbrowser
    68 
    +torbrowser-alpha-android-aarch64: submodule-update
    69 
    +	$(rbm) build release --target alpha --target browser-single-platform --target browser-android-aarch64 --target torbrowser
    73 70
    74 71 
     torbrowser-alpha-android-x86_64: submodule-update
    75 72 
     	$(rbm) build release --target alpha --target browser-single-platform --target browser-android-x86_64 --target torbrowser
    76 73
    77 
    -torbrowser-alpha-android-aarch64: submodule-update
    78 
    -	$(rbm) build release --target alpha --target browser-single-platform --target browser-android-aarch64 --target torbrowser
    79 
    -
    80 74 
     torbrowser-alpha-linux-x86_64: submodule-update
    81 75 
     	$(rbm) build release --target alpha --target browser-single-platform --target browser-linux-x86_64 --target torbrowser
    82 76
    ... ... @@ -110,15 +104,12 @@ torbrowser-nightly-android: submodule-update
    110 104 
     torbrowser-nightly-android-armv7: submodule-update
    111 105 
     	$(rbm) build release --target nightly --target browser-single-platform --target browser-android-armv7 --target torbrowser
    112 106
    113 
    -torbrowser-nightly-android-x86: submodule-update
    114 
    -	$(rbm) build release --target nightly --target browser-single-platform --target browser-android-x86 --target torbrowser
    107 
    +torbrowser-nightly-android-aarch64: submodule-update
    108 
    +	$(rbm) build release --target nightly --target browser-single-platform --target browser-android-aarch64 --target torbrowser
    115 109
    116 110 
     torbrowser-nightly-android-x86_64: submodule-update
    117 111 
     	$(rbm) build release --target nightly --target browser-single-platform --target browser-android-x86_64 --target torbrowser
    118 112
    119 
    -torbrowser-nightly-android-aarch64: submodule-update
    120 
    -	$(rbm) build release --target nightly --target browser-single-platform --target browser-android-aarch64 --target torbrowser
    121 
    -
    122 113 
     torbrowser-nightly-linux-x86_64: submodule-update
    123 114 
     	$(rbm) build release --target nightly --target browser-single-platform --target browser-linux-x86_64 --target torbrowser
    124 115
    ... ... @@ -152,15 +143,12 @@ torbrowser-testbuild-android: submodule-update
    152 143 
     torbrowser-testbuild-android-armv7: submodule-update
    153 144 
     	$(rbm) build release --target testbuild --target browser-single-platform --target browser-android-armv7 --target torbrowser
    154 145
    155 
    -torbrowser-testbuild-android-x86: submodule-update
    156 
    -	$(rbm) build release --target testbuild --target browser-single-platform --target browser-android-x86 --target torbrowser
    146 
    +torbrowser-testbuild-android-aarch64: submodule-update
    147 
    +	$(rbm) build release --target testbuild --target browser-single-platform --target browser-android-aarch64 --target torbrowser
    157 148
    158 149 
     torbrowser-testbuild-android-x86_64: submodule-update
    159 150 
     	$(rbm) build release --target testbuild --target browser-single-platform --target browser-android-x86_64 --target torbrowser
    160 151
    161 
    -torbrowser-testbuild-android-aarch64: submodule-update
    162 
    -	$(rbm) build release --target testbuild --target browser-single-platform --target browser-android-aarch64 --target torbrowser
    163 
    -
    164 152 
     torbrowser-testbuild-linux-x86_64: submodule-update
    165 153 
     	$(rbm) build release --target testbuild --target browser-single-platform --target browser-linux-x86_64 --target torbrowser
    166 154
    ... ... @@ -258,15 +246,12 @@ basebrowser-release: submodule-update
    258 246 
     basebrowser-release-android-armv7: submodule-update
    259 247 
     	$(rbm) build release --target release --target browser-single-platform --target browser-android-armv7 --target basebrowser
    260 248
    261 
    -basebrowser-release-android-x86: submodule-update
    262 
    -	$(rbm) build release --target release --target browser-single-platform --target browser-android-x86 --target basebrowser
    249 
    +basebrowser-release-android-aarch64: submodule-update
    250 
    +	$(rbm) build release --target release --target browser-single-platform --target browser-android-aarch64 --target basebrowser
    263 251
    264 252 
     basebrowser-release-android-x86_64: submodule-update
    265 253 
     	$(rbm) build release --target release --target browser-single-platform --target browser-android-x86_64 --target basebrowser
    266 254
    267 
    -basebrowser-release-android-aarch64: submodule-update
    268 
    -	$(rbm) build release --target release --target browser-single-platform --target browser-android-aarch64 --target basebrowser
    269 
    -
    270 255 
     basebrowser-release-linux-x86_64: submodule-update
    271 256 
     	$(rbm) build release --target release --target browser-single-platform --target browser-linux-x86_64 --target basebrowser
    272 257
    ... ... @@ -294,15 +279,12 @@ basebrowser-alpha: submodule-update
    294 279 
     basebrowser-alpha-android-armv7: submodule-update
    295 280 
     	$(rbm) build release --target alpha --target browser-single-platform --target browser-android-armv7 --target basebrowser
    296 281
    297 
    -basebrowser-alpha-android-x86: submodule-update
    298 
    -	$(rbm) build release --target alpha --target browser-single-platform --target browser-android-x86 --target basebrowser
    282 
    +basebrowser-alpha-android-aarch64: submodule-update
    283 
    +	$(rbm) build release --target alpha --target browser-single-platform --target browser-android-aarch64 --target basebrowser
    299 284
    300 285 
     basebrowser-alpha-android-x86_64: submodule-update
    301 286 
     	$(rbm) build release --target alpha --target browser-single-platform --target browser-android-x86_64 --target basebrowser
    302 287
    303 
    -basebrowser-alpha-android-aarch64: submodule-update
    304 
    -	$(rbm) build release --target alpha --target browser-single-platform --target browser-android-aarch64 --target basebrowser
    305 
    -
    306 288 
     basebrowser-alpha-linux-x86_64: submodule-update
    307 289 
     	$(rbm) build release --target alpha --target browser-single-platform --target browser-linux-x86_64 --target basebrowser
    308 290
    ... ... @@ -330,15 +312,12 @@ basebrowser-nightly: submodule-update
    330 312 
     basebrowser-nightly-android-armv7: submodule-update
    331 313 
     	$(rbm) build release --target nightly --target browser-single-platform --target browser-android-armv7 --target basebrowser
    332 314
    333 
    -basebrowser-nightly-android-x86: submodule-update
    334 
    -	$(rbm) build release --target nightly --target browser-single-platform --target browser-android-x86 --target basebrowser
    315 
    +basebrowser-nightly-android-aarch64: submodule-update
    316 
    +	$(rbm) build release --target nightly --target browser-single-platform --target browser-android-aarch64 --target basebrowser
    335 317
    336 318 
     basebrowser-nightly-android-x86_64: submodule-update
    337 319 
     	$(rbm) build release --target nightly --target browser-single-platform --target browser-android-x86_64 --target basebrowser
    338 320
    339 
    -basebrowser-nightly-android-aarch64: submodule-update
    340 
    -	$(rbm) build release --target nightly --target browser-single-platform --target browser-android-aarch64 --target basebrowser
    341 
    -
    342 321 
     basebrowser-nightly-linux-x86_64: submodule-update
    343 322 
     	$(rbm) build release --target nightly --target browser-single-platform --target browser-linux-x86_64 --target basebrowser
    344 323
    ... ... @@ -366,15 +345,12 @@ basebrowser-testbuild: submodule-update
    366 345 
     basebrowser-testbuild-android-armv7: submodule-update
    367 346 
     	$(rbm) build release --target testbuild --target browser-single-platform --target browser-android-armv7 --target basebrowser
    368 347
    369 
    -basebrowser-testbuild-android-x86: submodule-update
    370 
    -	$(rbm) build release --target testbuild --target browser-single-platform --target browser-android-x86 --target basebrowser
    348 
    +basebrowser-testbuild-android-aarch64: submodule-update
    349 
    +	$(rbm) build release --target testbuild --target browser-single-platform --target browser-android-aarch64 --target basebrowser
    371 350
    372 351 
     basebrowser-testbuild-android-x86_64: submodule-update
    373 352 
     	$(rbm) build release --target testbuild --target browser-single-platform --target browser-android-x86_64 --target basebrowser
    374 353
    375 
    -basebrowser-testbuild-android-aarch64: submodule-update
    376 
    -	$(rbm) build release --target testbuild --target browser-single-platform --target browser-android-aarch64 --target basebrowser
    377 
    -
    378 354 
     basebrowser-testbuild-linux-x86_64: submodule-update
    379 355 
     	$(rbm) build release --target testbuild --target browser-single-platform --target browser-linux-x86_64 --target basebrowser
    380 356

  • README
    ... ... @@ -134,7 +134,6 @@ name to the makefile target:
    134 134 
       $ make torbrowser-nightly-macos
    135 135 
       $ make torbrowser-nightly-android-armv7
    136 136 
       $ make torbrowser-nightly-android-aarch64
    137 
    -  $ make torbrowser-nightly-android-x86
    138 137 
       $ make torbrowser-nightly-android-x86_64
    139 138
    140 139 
     When you want to quickly do a build to test a change, you can use the

  • doc/HACKING.txt
    ... ... @@ -45,19 +45,18 @@ The targets are usually used to select:
    45 45
    46 46 
     - the platform: torbrowser-linux-x86_64, torbrowser-linux-aarch64,
    47 47 
       torbrowser-windows-i686, torbrowser-windows-x86_64, torbrowser-macos,
    48 
    -  torbrowser-android-armv7, torbrowser-android-aarch64, torbrowser-android-x86,
    48 
    +  torbrowser-android-armv7, torbrowser-android-aarch64,
    49 49 
       torbrowser-android-x86_64
    50 50 
     - the channel: release, nightly, alpha
    51 51
    52 52 
     The targets torbrowser-linux-x86_64, torbrowser-linux-aarch64,
    53 53 
     torbrowser-windows-i686, torbrowser-windows-x86_64, torbrowser-macos,
    54 
    -torbrowser-android-armv7, torbrowser-android-x86, torbrowser-android-aarch64,
    55 
    -torbrowser-android-x86_64 are special cases. They do not contain options
    56 
    -directly, instead they contain a list of other targets. For instance, the
    57 
    -torbrowser-linux-x86_64 target is pointing to the linux-x86_64 and linux
    58 
    -targets. You should define an option under the linux target if it applies to
    59 
    -Linux on both architectures, or under the linux-x86_64 if it only applies to
    60 
    -the x86_64 architecture.
    54 
    +torbrowser-android-armv7, torbrowser-android-aarch64, torbrowser-android-x86_64
    55 
    +are special cases. They do not contain options directly, instead they contain a
    56 
    +list of other targets. For instance, the torbrowser-linux-x86_64 target is
    57 
    +pointing to the linux-x86_64 and linux targets. You should define an option
    58 
    +under the linux target if it applies to Linux on both architectures, or under
    59 
    +the linux-x86_64 if it only applies to the x86_64 architecture.
    61 60
    62 61 
     An option that is defined at the root of rbm.conf can be overridden by
    63 62 
     an other definition under a target, or inside projects/$project/config.
    ... ... @@ -160,8 +159,6 @@ $platform should be one of the following:
    160 159
    161 160 
      - torbrowser-android-aarch64
    162 161
    163 
    - - torbrowser-android-x86
    164 
    -
    165 162 
      - torbrowser-android-x86_64
    166 163
    167 164 
     For example, to see tor's build script for linux x86_64 on the alpha

  • doc/MAKEFILE.txt
    ... ... @@ -15,8 +15,8 @@ Build Tor Browser for the release channel, for all supported platforms
    15 15 
     directory torbrowser/release/$version.
    16 16
    17 17 
     torbrowser-release-{linux-x86_64,linux-aarch64,windows-i686,macos,
    18 
    -                    android-armv7, android-x86,android-x86_64,
    19 
    -                    android-aarch64,desktop,android}
    18 
    +                    android-armv7,android-aarch64,android-x86_64,
    19 
    +                    desktop,android}
    20 20 
     --------------------------------------------------------------------
    21 21 
     Same as torbrowser-release, for the selected platform only. The "desktop"
    22 22 
     platform means Linux, Windows and macOS. The "android" platform means
    ... ... @@ -28,8 +28,8 @@ Build Tor Browser for the alpha channel, for all supported platforms.
    28 28 
     The resulting build can be found in directory torbrowser/alpha/$version.
    29 29
    30 30 
     torbrowser-alpha-{linux-x86_64,linux-aarch64,windows-i686,macos,
    31 
    -                  android-armv7,android-x86,android-x86_64,
    32 
    -                  android-aarch64,desktop,android}
    31 
    +                  android-armv7,android-aarch64,android-x86_64,
    32 
    +                  desktop,android}
    33 33 
     ------------------------------------------------------------------
    34 34 
     Same as torbrowser-alpha, for the selected platform only.
    35 35
    ... ... @@ -43,8 +43,8 @@ components.
    43 43 
     The resulting build can be found in directory torbrowser/nightly/$date
    44 44
    45 45 
     torbrowser-nightly-{linux-x86_64,linux-aarch64,windows-i686,macos,
    46 
    -                    android-armv7,android-x86,android-x86_64,
    47 
    -                    android-aarch64,desktop,android}
    46 
    +                    android-armv7,android-aarch64,android-x86_64,
    47 
    +                    desktop,android}
    48 48 
     --------------------------------------------------------------------
    49 49 
     Same as torbrowser-nightly, for the selected platform only.
    50 50
    ... ... @@ -57,8 +57,8 @@ editing rbm.local.conf. The resulting build can be found in directory
    57 57 
     testbuild.
    58 58
    59 59 
     torbrowser-testbuild-{linux-x86_64,linux-aarch64,windows-i686,macos,
    60 
    -                    android-armv7,android-x86,android-x86_64,
    61 
    -                    android-aarch64,desktop,android}
    60 
    +                    android-armv7,android-aarch64,android-x86_64,
    61 
    +                    desktop,android}
    62 62 
     -----------------------------------------------------------------
    63 63 
     Same as torbrowser-testbuild, for the selected platform only.
    64 64

  • projects/browser/build.android
    ... ... @@ -2,12 +2,6 @@
    2 2 
     [% c("var/set_default_env") -%]
    3 3 
     [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %]
    4 4
    5 
    -[% IF c("var/android-x86") -%]
    6 
    -  tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/node') %]
    7 
    -  export PATH=/var/tmp/dist/node/bin:$PATH
    8 
    -  tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/uglifyjs') %]
    9 
    -[% END -%]
    10 
    -
    11 5 
     # Bundle our extension(s).
    12 6 
     #
    13 7 
     # NoScript will be copied over to the profile folder
    ... ... @@ -64,11 +58,6 @@ function generate_apk {
    64 58 
       [% IF c("var/tor-browser") -%]
    65 59 
         cp -a ../moat_countries.json ../tor/pluggable_transports/pt_config.json chrome/toolkit/content/global/
    66 60 
       [% END -%]
    67 
    -  [% IF c("var/android-x86") -%]
    68 
    -    find actors chrome modules moz-src \
    69 
    -      -name '*.js' -or -name '*.mjs' \
    70 
    -      -exec /var/tmp/dist/uglifyjs/bin/uglifyjs --in-situ {} \;
    71 
    -  [% END -%]
    72 61 
       [% c('zip', {
    73 62 
             zip_src   => [ '.' ],
    74 63 
             zip_args  => '-0 ../assets/omni.ja',

  • projects/browser/config
    ... ... @@ -158,9 +158,3 @@ input_files:
    158 158 
         # tor-browser-build#40920
    159 159 
       - filename: sort-baseline.py
    160 160 
         enable: '[% c("var/android") %]'
    161 
    -  - project: node
    162 
    -    name: node
    163 
    -    enable: '[% c("var/android-x86") %]'
    164 
    -  - project: uglifyjs
    165 
    -    name: uglifyjs
    166 
    -    enable: '[% c("var/android-x86") %]'

  • projects/geckoview/README.md
    ... ... @@ -32,7 +32,7 @@ Instead, we've
    32 32 
     in tor-browser.git.
    33 33
    34 34 
     Notice that it isn't necessary to include all the architectures Mozilla and us
    35 
    -support (currently, aarch64, armv7, x86_64 and x86).
    35 
    +support (currently, aarch64, armv7 and x86_64).
    36 36 
     The merge automation also supports "merging" one architecture.
    37 37 
     We use this hack when `var/android_single_arch` is defined, which is the default
    38 38 
     only in testbuilds.

  • projects/geckoview/build_apk
    ... ... @@ -11,18 +11,14 @@ tar -C $builddir -xf [% project %]-[% c('version') %].tar.[% c('compress_tar') %
    11 11 
       mv $rootdir/[% c('input_files_by_name/geckoview_armv7') %]/artifacts/* $outdir/[% project %]/artifacts/armeabi-v7a
    12 12 
       mkdir -p $outdir/[% project %]/artifacts/arm64-v8a
    13 13 
       mv $rootdir/[% c('input_files_by_name/geckoview_aarch64') %]/artifacts/* $outdir/[% project %]/artifacts/arm64-v8a
    14 
    -  mkdir -p $outdir/[% project %]/artifacts/x86
    15 
    -  mv $rootdir/[% c('input_files_by_name/geckoview_x86') %]/artifacts/* $outdir/[% project %]/artifacts/x86
    16 14 
       mkdir -p $outdir/[% project %]/artifacts/x86_64
    17 15 
       mv $rootdir/[% c('input_files_by_name/geckoview_x86_64') %]/artifacts/* $outdir/[% project %]/artifacts/x86_64
    18 16 
     [% END -%]
    19 17
    20 18 
     # Specify the architectures we want to merge
    21 
    -export MOZ_ANDROID_FAT_AAR_ARCHITECTURES=armeabi-v7a,arm64-v8a,x86,x86_64
    19 
    +export MOZ_ANDROID_FAT_AAR_ARCHITECTURES=armeabi-v7a,arm64-v8a,x86_64
    22 20 
     export MOZ_ANDROID_FAT_AAR_ARMEABI_V7A=$rootdir/[% c('input_files_by_name/geckoview_armv7') %]/geckoview/*.aar
    23 21 
     export MOZ_ANDROID_FAT_AAR_ARM64_V8A=$rootdir/[% c('input_files_by_name/geckoview_aarch64') %]/geckoview/*.aar
    24 
    -# Specifying just "x86" is not differentiating enough
    25 
    -export MOZ_ANDROID_FAT_AAR_X86=$rootdir/[% c('input_files_by_name/geckoview_x86') %]/geckoview/*.aar
    26 22 
     export MOZ_ANDROID_FAT_AAR_X86_64=$rootdir/[% c('input_files_by_name/geckoview_x86_64') %]/geckoview/*.aar
    27 23
    28 24 
     cd $builddir/[% project %]-[% c("version") %]

  • projects/geckoview/config
    ... ... @@ -93,11 +93,6 @@ steps:
    93 93 
             pkg_type: build
    94 94 
             target_prepend:
    95 95 
               - torbrowser-android-aarch64
    96 
    -      - name: geckoview_x86
    97 
    -        project: geckoview
    98 
    -        pkg_type: build
    99 
    -        target_prepend:
    100 
    -          - torbrowser-android-x86
    101 96 
           - name: geckoview_x86_64
    102 97 
             project: geckoview
    103 98 
             pkg_type: build

  • projects/go/config
    ... ... @@ -68,18 +68,15 @@ targets:
    68 68 
       android:
    69 69 
         var:
    70 70 
           GOOS: android
    71 
    -  android-x86:
    72 
    -    var:
    73 
    -      GOARCH: 386
    74 
    -  android-x86_64:
    75 
    -    var:
    76 
    -      GOARCH: amd64
    77 71 
       android-armv7:
    78 72 
         var:
    79 73 
           GOARCH: arm
    80 74 
       android-aarch64:
    81 75 
         var:
    82 76 
           GOARCH: arm64
    77 
    +  android-x86_64:
    78 
    +    var:
    79 
    +      GOARCH: amd64
    83 80
    84 81 
     input_files:
    85 82 
       - project: container-image

  • projects/release/build
    ... ... @@ -19,9 +19,6 @@ function mv_files {
    19 19 
     [% IF c("var/browser_platforms/android-armv7") -%]
    20 20 
       mv_files "[% c('input_files_by_name/android-armv7') %]"
    21 21 
     [% END -%]
    22 
    -[% IF c("var/browser_platforms/android-x86") -%]
    23 
    -  mv_files "[% c('input_files_by_name/android-x86') %]"
    24 
    -[% END -%]
    25 22 
     [% IF c("var/browser_platforms/android-x86_64") -%]
    26 23 
       mv_files "[% c('input_files_by_name/android-x86_64') %]"
    27 24 
     [% END -%]

  • projects/release/config
    ... ... @@ -36,18 +36,14 @@ targets:
    36 36 
         var:
    37 37 
           browser_platforms:
    38 38 
             android-armv7: 1
    39 
    -  browser-android-x86:
    39 
    +  browser-android-aarch64:
    40 40 
         var:
    41 41 
           browser_platforms:
    42 
    -        android-x86: 1
    42 
    +        android-aarch64: 1
    43 43 
       browser-android-x86_64:
    44 44 
         var:
    45 45 
           browser_platforms:
    46 46 
             android-x86_64: 1
    47 
    -  browser-android-aarch64:
    48 
    -    var:
    49 
    -      browser_platforms:
    50 
    -        android-aarch64: 1
    51 47 
       browser-linux-x86_64:
    52 48 
         var:
    53 49 
           browser_platforms:
    ... ... @@ -158,13 +154,13 @@ input_files:
    158 154 
           - '[% c("var/build_target") %]'
    159 155 
           - '[% c("var/browser_type") %]-android-armv7'
    160 156
    161 
    -  - name: android-x86
    157 
    +  - name: android-aarch64
    162 158 
         project: browser
    163 
    -    enable: '[% c("var/browser_platforms/android-x86") %]'
    159 
    +    enable: '[% c("var/browser_platforms/android-aarch64") %]'
    164 160 
         target:
    165 161 
           - '[% c("var/containers_target") %]'
    166 162 
           - '[% c("var/build_target") %]'
    167 
    -      - '[% c("var/browser_type") %]-android-x86'
    163 
    +      - '[% c("var/browser_type") %]-android-aarch64'
    168 164
    169 165 
       - name: android-x86_64
    170 166 
         project: browser
    ... ... @@ -174,14 +170,6 @@ input_files:
    174 170 
           - '[% c("var/build_target") %]'
    175 171 
           - '[% c("var/browser_type") %]-android-x86_64'
    176 172
    177 
    -  - name: android-aarch64
    178 
    -    project: browser
    179 
    -    enable: '[% c("var/browser_platforms/android-aarch64") %]'
    180 
    -    target:
    181 
    -      - '[% c("var/containers_target") %]'
    182 
    -      - '[% c("var/build_target") %]'
    183 
    -      - '[% c("var/browser_type") %]-android-aarch64'
    184 
    -
    185 173 
       - name: linux-x86_64
    186 174 
         project: browser
    187 175 
         enable: '[% c("var/browser_platforms/linux-x86_64") %]'

  • projects/tor-expert-bundle-aar/build
    ... ... @@ -12,7 +12,7 @@ mkdir -p $distdir
    12 12
    13 13 
       # We take for granted that we can take the manifests from any of the bundles
    14 14 
       # without having to change it.
    15 
    -  [% FOREACH arch = ['armv7', 'aarch64', 'x86', 'x86_64'] -%]
    15 
    +  [% FOREACH arch = ['armv7', 'aarch64', 'x86_64'] -%]
    16 16 
         unzip -o $rootdir/[% c('input_files_by_name/tor-expert-bundle-' _ arch) %]/tor-expert-bundle-[% arch %].aar
    17 17 
       [% END -%]
    18 18 
       [% c('zip', {

  • projects/tor-expert-bundle-aar/config
    ... ... @@ -15,11 +15,6 @@ input_files:
    15 15 
         target_replace:
    16 16 
           '^torbrowser-(?!testbuild).*': 'torbrowser-android-aarch64'
    17 17 
         enable: '[% !c("var/android_single_arch") %]'
    18 
    -  - project: tor-expert-bundle
    19 
    -    name: tor-expert-bundle-x86
    20 
    -    target_replace:
    21 
    -      '^torbrowser-(?!testbuild).*': 'torbrowser-android-x86'
    22 
    -    enable: '[% !c("var/android_single_arch") %]'
    23 18 
       - project: tor-expert-bundle
    24 19 
         name: tor-expert-bundle-x86_64
    25 20 
         target_replace:

  • projects/tor-expert-bundle/config
    ... ... @@ -22,7 +22,7 @@ input_files:
    22 22 
         project: lyrebird
    23 23 
       - name: conjure
    24 24 
         project: conjure
    25 
    -    enable: '[% !c("var/android-x86") && !c("var/android-x86_64") %]'
    25 
    +    enable: '[% !c("var/android-x86_64") %]'
    26 26 
       - filename: pt_config.json
    27 27 
       - filename: torrc-defaults
    28 28 
         enable: '[% !c("var/android") %]'

  • projects/uglifyjs/README.md deleted
    1 
    -This project fetches UglifyJS without any other changes.

  • projects/uglifyjs/build deleted
    1 
    -#!/bin/bash
    2 
    -tar -xf [% project %]-[% c('version') %].tar.[% c('compress_tar') %]
    3 
    -mv [% project %]-[% c('version') %] [% project %]
    4 
    -tar -caf [% dest_dir %]/[% c("filename") %] [% project %]

  • projects/uglifyjs/config deleted
    1 
    -version: 3.19.3
    2 
    -filename: 'uglifyjs-[% c("version") %]-[% c("var/build_id") %].tar.[% c("compress_tar") %]'
    3 
    -git_hash: 3ea33afc72462a470466473208a33379b7204765
    4 
    -git_url: https://github.com/mishoo/UglifyJS.git

  • rbm.conf
    ... ... @@ -83,7 +83,6 @@ var:
    83 83 
       browser_default_channel: alpha
    84 84 
       browser_platforms:
    85 85 
         android-armv7: '[% c("var/browser_platforms/is_android_release") %]'
    86 
    -    android-x86: '[% c("var/browser_platforms/is_android_release") %]'
    87 86 
         android-x86_64: '[% c("var/browser_platforms/is_android_release") %]'
    88 87 
         android-aarch64: '[% c("var/browser_platforms/is_android_release") %]'
    89 88 
         linux-x86_64: '[% c("var/browser_platforms/is_desktop_release") %]'
    ... ... @@ -104,9 +103,8 @@ var:
    104 103 
         signing_android: |
    105 104 
           [%-
    106 105 
           c("var/browser_platforms/android-armv7") ||
    107 
    -      c("var/browser_platforms/android-x86") ||
    108 
    -      c("var/browser_platforms/android-x86_64") ||
    109 
    -      c("var/browser_platforms/android-aarch64")
    106 
    +      c("var/browser_platforms/android-aarch64") ||
    107 
    +      c("var/browser_platforms/android-x86_64")
    110 108 
           -%]
    111 109 
         # signing_desktop is used in signing scripts to check if at least
    112 110 
         # one desktop platform is being signed/published
    ... ... @@ -430,22 +428,6 @@ targets:
    430 428 
           toolchain_arch: arm
    431 429 
           abi: armeabi-v7a
    432 430 
           cross_prefix: armv7a-linux-androideabi
    433 
    -  torbrowser-android-x86:
    434 
    -    - android-x86
    435 
    -    - android
    436 
    -    - torbrowser
    437 
    -  basebrowser-android-x86:
    438 
    -    - android-x86
    439 
    -    - android
    440 
    -    - basebrowser
    441 
    -  android-x86:
    442 
    -    arch: x86
    443 
    -    var:
    444 
    -      android-x86: 1
    445 
    -      osname: android-x86
    446 
    -      toolchain_arch: x86
    447 
    -      abi: x86
    448 
    -      cross_prefix: i686-linux-android
    449 431 
       torbrowser-android-x86_64:
    450 432 
         - android-x86_64
    451 433 
         - android

  • tools/signing/linux-signer-sign-android-apks
    ... ... @@ -6,7 +6,7 @@ script_dir=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
    6 6 
     source "$script_dir/functions"
    7 7
    8 8 
     topdir="$script_dir/../.."
    9 
    -ARCHS="armv7 aarch64 x86 x86_64"
    9 
    +ARCHS="armv7 aarch64 x86_64"
    10 10 
     test "$SIGNING_PROJECTNAME" = 'torvpn' && ARCHS='multiarch'
    11 11 
     projname=$(project-name)
    12 12 
     # tbb_version_type, tbb_version and SIGNING_PROJECTNAME are used in

  • tools/update-responses/update_responses
    ... ... @@ -204,7 +204,7 @@ sub get_perplatform_downloads {
    204 204 
               $os = $1;
    205 205 
             } elsif ($file =~ m/^$config->{appname_bundle}-(windows-i686|windows-x86_64)-(portable-|)${version}.exe$/) {
    206 206 
               $os = $1;
    207 
    -        } elsif ($file =~ m/^$config->{appname_bundle}-(android-armv7|android-x86|android-x86_64|android-aarch64)-${version}.apk$/) {
    207 
    +        } elsif ($file =~ m/^$config->{appname_bundle}-(android-armv7|android-aarch64|android-x86_64)-${version}.apk$/) {
    208 208 
               $os = $1;
    209 209 
             } else {
    210 210 
                 next;

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help Notification message regarding https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/75e9ffdaa49cba2d91b60c17f2d75de9b4d2fde9...67c6c15289812744dab5c7de3e01786004d1d2ec at 1764157734