[tor-bugs] #34145 [Applications/Tor Browser]: Fix fallout from transitioning to 77.0b1

[Tor Bug Tracker & Wiki]

#34145: Fix fallout from transitioning to 77.0b1
-------------------------------------------------+-------------------------
 Reporter:  gk                                   |          Owner:  tbb-
                                                 |  team
     Type:  defect                               |         Status:  new
 Priority:  High                                 |      Milestone:
Component:  Applications/Tor Browser             |        Version:
 Severity:  Normal                               |     Resolution:
 Keywords:  tbb-mobile, ReleaseTrainMigration,   |  Actual Points:
  TorBrowserTeam202005, GeorgKoppen202005        |
Parent ID:  #33533                               |         Points:
 Reviewer:                                       |        Sponsor:
-------------------------------------------------+-------------------------

Comment (by gk):

 Replying to [comment:2 gk]:
 > Linking libxul fails now with
 > {{{
 > 50:41.65 /var/tmp/dist/android-toolchain/android-ndk/toolchains/arm-
 linux-androideabi-4.9/prebuilt/linux-x86_64/lib/gcc/arm-linux-
 androideabi/4.9.x/../../../../arm-linux-androideabi/bin/ld: error:
 /var/tmp/build/geckoview-2c5ac3b9c8c3/obj-arm-linux-
 androideabi/toolkit/library/build/../../../media/libaom/cpu-features.o:
 multiple definition of 'android_getCpuCount'
 > 50:41.65 /var/tmp/dist/android-toolchain/android-ndk/toolchains/arm-
 linux-androideabi-4.9/prebuilt/linux-x86_64/lib/gcc/arm-linux-
 androideabi/4.9.x/../../../../arm-linux-androideabi/bin/ld: /var/tmp/build
 /geckoview-2c5ac3b9c8c3/obj-arm-linux-
 androideabi/toolkit/library/build/../../../media/libvpx/cpu-features.o:
 previous definition here
 > 50:41.65 /var/tmp/dist/android-toolchain/android-ndk/toolchains/arm-
 linux-androideabi-4.9/prebuilt/linux-x86_64/lib/gcc/arm-linux-
 androideabi/4.9.x/../../../../arm-linux-androideabi/bin/ld: error:
 /var/tmp/build/geckoview-2c5ac3b9c8c3/obj-arm-linux-
 androideabi/toolkit/library/build/../../../media/libaom/cpu-features.o:
 multiple definition of 'android_getCpuFamily'
 > 50:41.65 /var/tmp/dist/android-toolchain/android-ndk/toolchains/arm-
 linux-androideabi-4.9/prebuilt/linux-x86_64/lib/gcc/arm-linux-
 androideabi/4.9.x/../../../../arm-linux-androideabi/bin/ld: /var/tmp/build
 /geckoview-2c5ac3b9c8c3/obj-arm-linux-
 androideabi/toolkit/library/build/../../../media/libvpx/cpu-features.o:
 previous definition here
 > 50:41.65 /var/tmp/dist/android-toolchain/android-ndk/toolchains/arm-
 linux-androideabi-4.9/prebuilt/linux-x86_64/lib/gcc/arm-linux-
 androideabi/4.9.x/../../../../arm-linux-androideabi/bin/ld: error:
 /var/tmp/build/geckoview-2c5ac3b9c8c3/obj-arm-linux-
 androideabi/toolkit/library/build/../../../media/libaom/cpu-features.o:
 multiple definition of 'android_getCpuFeatures'
 > 50:41.65 /var/tmp/dist/android-toolchain/android-ndk/toolchains/arm-
 linux-androideabi-4.9/prebuilt/linux-x86_64/lib/gcc/arm-linux-
 androideabi/4.9.x/../../../../arm-linux-androideabi/bin/ld: /var/tmp/build
 /geckoview-2c5ac3b9c8c3/obj-arm-linux-
 androideabi/toolkit/library/build/../../../media/libvpx/cpu-features.o:
 previous definition here
 > 50:41.65 /var/tmp/dist/android-toolchain/android-ndk/toolchains/arm-
 linux-androideabi-4.9/prebuilt/linux-x86_64/lib/gcc/arm-linux-
 androideabi/4.9.x/../../../../arm-linux-androideabi/bin/ld: error:
 /var/tmp/build/geckoview-2c5ac3b9c8c3/obj-arm-linux-
 androideabi/toolkit/library/build/../../../media/libaom/cpu-features.o:
 multiple definition of 'android_getCpuIdArm'
 > 50:41.65 /var/tmp/dist/android-toolchain/android-ndk/toolchains/arm-
 linux-androideabi-4.9/prebuilt/linux-x86_64/lib/gcc/arm-linux-
 androideabi/4.9.x/../../../../arm-linux-androideabi/bin/ld: /var/tmp/build
 /geckoview-2c5ac3b9c8c3/obj-arm-linux-
 androideabi/toolkit/library/build/../../../media/libvpx/cpu-features.o:
 previous definition here
 > 50:41.65 /var/tmp/dist/android-toolchain/android-ndk/toolchains/arm-
 linux-androideabi-4.9/prebuilt/linux-x86_64/lib/gcc/arm-linux-
 androideabi/4.9.x/../../../../arm-linux-androideabi/bin/ld: error:
 /var/tmp/build/geckoview-2c5ac3b9c8c3/obj-arm-linux-
 androideabi/toolkit/library/build/../../../media/libaom/cpu-features.o:
 multiple definition of 'android_setCpu'
 > 50:41.65 /var/tmp/dist/android-toolchain/android-ndk/toolchains/arm-
 linux-androideabi-4.9/prebuilt/linux-x86_64/lib/gcc/arm-linux-
 androideabi/4.9.x/../../../../arm-linux-androideabi/bin/ld: /var/tmp/build
 /geckoview-2c5ac3b9c8c3/obj-arm-linux-
 androideabi/toolkit/library/build/../../../media/libvpx/cpu-features.o:
 previous definition here
 > 50:41.65 /var/tmp/dist/android-toolchain/android-ndk/toolchains/arm-
 linux-androideabi-4.9/prebuilt/linux-x86_64/lib/gcc/arm-linux-
 androideabi/4.9.x/../../../../arm-linux-androideabi/bin/ld: error:
 /var/tmp/build/geckoview-2c5ac3b9c8c3/obj-arm-linux-
 androideabi/toolkit/library/build/../../../media/libaom/cpu-features.o:
 multiple definition of 'android_setCpuArm'
 > 50:41.65 /var/tmp/dist/android-toolchain/android-ndk/toolchains/arm-
 linux-androideabi-4.9/prebuilt/linux-x86_64/lib/gcc/arm-linux-
 androideabi/4.9.x/../../../../arm-linux-androideabi/bin/ld: /var/tmp/build
 /geckoview-2c5ac3b9c8c3/obj-arm-linux-
 androideabi/toolkit/library/build/../../../media/libvpx/cpu-features.o:
 previous definition here
 > }}}

 That's actually #31915 as we forgot a patch when rebasing.

--
Ticket URL: <https://trac.torproject.org/projects/tor/ticket/34145#comment:3>
Tor Bug Tracker & Wiki <https://trac.torproject.org/>
The Tor Project: anonymity online