[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [Git][tpo/applications/mullvad-browser][mullvad-browser-150.0a1-16.0-2] 4 commits: !dropme Bug 2024724 - Fix PowerCounters.h because we do not compile...

Title: GitLab

Pier Angelo Vendrame pushed to branch mullvad-browser-150.0a1-16.0-2 at The Tor Project / Applications / Mullvad Browser

Commits:

  • 6c679501
    by Damien Carver at 2026-04-30T13:57:51+02:00 
    !dropme Bug 2024724 - Fix PowerCounters.h because we do not compile PowerCounters-win.cpp against __MINGW32__ r=canaltinova,profiler-reviewers

BB 44868: Backport upstream commit to fix Windows builds

This commit should be dropped during the 151 rebase as it was reverted
as part of https://bugzilla.mozilla.org/show_bug.cgi?id=2026031 in the
upstream 151 branch.
  • 999f3a02
    by Nicolas Vigier at 2026-04-30T13:59:21+02:00 
    fixup! BB 43615: Add Gitlab Issue and Merge Request templates

BB 44870: Remove legacy branch from gitlab templates
  • 7942a77a
    by Beatriz Rizental at 2026-04-30T13:59:32+02:00 
    fixup! Base Browser's .mozconfigs.

Bug 44848: Stop overwriting Android toolchain paths.
Keep the overwrites only on tor-browser-build.
  • d513cebd
    by Nicolas Vigier at 2026-04-30T13:59:42+02:00 
    fixup! Base Browser's .mozconfigs.

BB 44555: Remove mozconfig-linux-i686

8 changed files:

Changes:

  • .gitlab/issue_templates/050 Backport.md
    ... ... @@ -24,7 +24,6 @@ please ensure the title has the following format:
    24 24
    25 25 
     - [ ] Alpha
    26 26 
     - [ ] Stable
    27 
    -- [ ] Legacy
    28 27
    29 28 
     ## Notes
    30 29

  • browser/config/mozconfigs/base-browser-android
    ... ... @@ -13,20 +13,6 @@ CC="clang"
    13 13 
     CXX="clang++"
    14 14 
     ac_add_options --enable-linker=lld
    15 15
    16 
    -if test -n "$ANDROID_HOME"; then
    17 
    -    ac_add_options --with-android-sdk=$ANDROID_HOME
    18 
    -fi
    19 
    -
    20 
    -if test -n "$ANDROID_NDK_HOME"; then
    21 
    -  ac_add_options --with-android-ndk=$ANDROID_NDK_HOME
    22 
    -fi
    23 
    -
    24 
    -if test -n "$GRADLE_HOME"; then
    25 
    -    ac_add_options --with-gradle=$GRADLE_HOME/bin/gradle
    26 
    -fi
    27 
    -# Otherwise (as per /mobile/android/gradle.config) a version will be downloaded by the gradle wrapper when needed
    28 
    -# so don't use this override, and let it do it's thing
    29 
    -
    30 16 
     ac_add_options --enable-strip
    31 17 
     ac_add_options --enable-install-strip
    32 18 
     ac_add_options --disable-tests

  • mozconfig-android-all
    ... ... @@ -8,10 +8,6 @@ ac_add_options --enable-application=mobile/android
    8 8
    9 9 
     ac_add_options --disable-compile-environment
    10 10
    11 
    -ac_add_options --with-java-bin-path=$JAVA_HOME/bin
    12 
    -ac_add_options --with-android-sdk=$ANDROID_HOME
    13 
    -ac_add_options --with-gradle=$GRADLE_HOME/bin/gradle
    14 
    -
    15 11 
     ac_add_options --disable-tests
    16 12 
     ac_add_options --disable-debug
    17 13

  • mozconfig-linux-i686 deleted
    1 
    -. $topsrcdir/browser/config/mozconfigs/base-browser
    2 
    -
    3 
    -ac_add_options --target=i686-linux-gnu
    4 
    -
    5 
    -# Moz switched to lld for all Linux targets in Bug 1839739.
    6 
    -# Also, gold used not to work with debug symbols (tor-browser#42146).
    7 
    -ac_add_options --enable-linker=lld
    8 
    -
    9 
    -ac_add_options --disable-strip
    10 
    -ac_add_options --disable-install-strip
    11 
    -
    12 
    -ac_add_options --enable-default-toolkit=cairo-gtk3
    13 
    -
    14 
    -# Let's make sure no preference is enabling either Adobe's or Google's CDM.
    15 
    -ac_add_options --disable-eme
    16 
    -

  • mozglue/baseprofiler/public/BaseProfilerState.h
    ... ... @@ -136,7 +136,7 @@ class MOZ_RAII AutoProfilerStats {
    136 136 
         "Record the power used by the entire system with each sample. " \
    137 137 
         "Only available with Intel CPUs and requires setting "          \
    138 138 
         "the sysctl kernel.perf_event_paranoid to 0."
    139 
    -#elif defined(GP_OS_windows)
    139 
    +#elif defined(GP_OS_windows) && defined(_MSC_VER)
    140 140 
     #  define POWER_HELP                                                       \
    141 141 
         "Record the value of every energy meter available on the system with " \
    142 142 
         "each sample. Only available on Windows 11 with Intel CPUs."

  • tools/profiler/core/PowerCounters.h
    ... ... @@ -10,7 +10,7 @@
    10 10 
     #include "mozilla/UniquePtr.h"
    11 11 
     #include "mozilla/Vector.h"
    12 12
    13 
    -#if defined(GP_OS_windows)
    13 
    +#if defined(GP_OS_windows) && defined(_MSC_VER)
    14 14 
     class PowerMeterDevice;
    15 15 
     #endif
    16 16 
     #if defined(GP_PLAT_arm64_darwin)
    ... ... @@ -50,20 +50,20 @@ bool GetRailEnergyData(RailEnergyData*, size_t* size_of_arr);
    50 50
    51 51 
     class PowerCounters {
    52 52 
      public:
    53 
    -#if defined(GP_OS_windows) || defined(GP_OS_darwin) || \
    53 
    +#if (defined(GP_OS_windows) && defined(_MSC_VER)) || defined(GP_OS_darwin) || \
    54 54 
         defined(GP_PLAT_amd64_linux) || defined(GP_PLAT_arm64_android)
    55 55 
       explicit PowerCounters();
    56 56 
     #else
    57 57 
       explicit PowerCounters() {};
    58 58 
     #endif
    59 
    -#if defined(GP_OS_windows) || defined(GP_PLAT_amd64_darwin) || \
    60 
    -    defined(GP_PLAT_arm64_android)
    59 
    +#if (defined(GP_OS_windows) && defined(_MSC_VER)) || \
    60 
    +    defined(GP_PLAT_amd64_darwin) || defined(GP_PLAT_arm64_android)
    61 61 
       ~PowerCounters();
    62 62 
     #else
    63 63 
       ~PowerCounters() = default;
    64 64 
     #endif
    65 
    -#if defined(GP_OS_windows) || defined(GP_PLAT_amd64_darwin) || \
    66 
    -    defined(GP_PLAT_arm64_android)
    65 
    +#if (defined(GP_OS_windows) && defined(_MSC_VER)) || \
    66 
    +    defined(GP_PLAT_amd64_darwin) || defined(GP_PLAT_arm64_android)
    67 67 
       void Sample();
    68 68 
     #else
    69 69 
       void Sample() {};
    ... ... @@ -75,7 +75,7 @@ class PowerCounters {
    75 75 
      private:
    76 76 
       CountVector mCounters;
    77 77
    78 
    -#if defined(GP_OS_windows)
    78 
    +#if defined(GP_OS_windows) && defined(_MSC_VER)
    79 79 
       mozilla::Vector<mozilla::UniquePtr<PowerMeterDevice>> mPowerMeterDevices;
    80 80 
     #endif
    81 81 
     #if defined(GP_PLAT_amd64_darwin)

  • tools/profiler/moz.build
    ... ... @@ -167,6 +167,7 @@ elif CONFIG["OS_TARGET"] == "WINNT" and CONFIG["TARGET_CPU"] in (
    167 167 
         UNIFIED_SOURCES += [
    168 168 
             "gecko/nsProfiler.cpp",
    169 169 
         ]
    170 
    +    # Keep in sync with PowerCounters.h, BaseProfilerState.h and ProfilerState.h (see __MINGW32__)
    170 171 
         if CONFIG["CC_TYPE"] == "clang-cl":
    171 172 
             UNIFIED_SOURCES += [
    172 173 
                 "core/PowerCounters-win.cpp",

  • tools/profiler/public/ProfilerState.h
    ... ... @@ -31,7 +31,7 @@
    31 31 
         "Only available with Intel CPUs and requires setting "          \
    32 32 
         "the sysctl kernel.perf_event_paranoid to 0."
    33 33
    34 
    -#elif defined(GP_OS_windows)
    34 
    +#elif defined(GP_OS_windows) && defined(_MSC_VER)
    35 35 
     #  define POWER_HELP                                                       \
    36 36 
         "Record the value of every energy meter available on the system with " \
    37 37 
         "each sample. Only available on Windows 11 with Intel CPUs."

    • —
    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/mullvad-browser/-/compare/3d7561e8d8b467e5e4fa26c91e71f37847e889b9...d513cebd009c7ea9a7cb0233ba031d89dae9499a at 1777550417 

    _______________________________________________
tor-commits mailing list -- tor-commits@xxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to tor-commits-leave@xxxxxxxxxxxxxxxxxxxx