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

Bug 41720 (fix): Use the new function for Android+Linux i686. 

When we cherry-picked the fix from main, we did not get any conflicts,
but we needed to update also the commands for Linux i686 and Android
x86, which have been dropped in 16.0aX, but are still built in 15.0.X.
parent 357cde9b

projects/release/build

+2 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ function merge_directory { 
  merge_directory "[% c('input_files_by_name/android-armv7') %]"

[% END -%]

[% IF c("var/browser_platforms/android-x86") -%]

  mv_files "[% c('input_files_by_name/android-x86') %]"

  merge_directory "[% c('input_files_by_name/android-x86') %]"

[% END -%]

[% IF c("var/browser_platforms/android-x86_64") -%]

  merge_directory "[% c('input_files_by_name/android-x86_64') %]"
@@ -43,7 +43,7 @@ function merge_directory { 
  merge_directory "[% c('input_files_by_name/macos-aarch64') %]"

[% END -%]

[% IF c("var/browser_platforms/linux-i686") -%]

  mv_files "[% c('input_files_by_name/linux-i686') %]"

  merge_directory "[% c('input_files_by_name/linux-i686') %]"

[% END -%]

[% IF c("var/browser_platforms/linux-x86_64") -%]

  merge_directory "[% c('input_files_by_name/linux-x86_64') %]"