Merge branch 'master' into encode-fix

google · Jan 3, 2024 · 79a5e80 · 79a5e80
2 parents 428d056 + 4c57a64
commit 79a5e80
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 227 deletions.
diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml
@@ -159,10 +159,6 @@ jobs:
             build_system: bazel
             bazel_project: java
 
-          - name: bazel:js
-            build_system: bazel
-            bazel_project: js
-
           - name: bazel:research
             build_system: bazel
             bazel_project: research
@@ -182,11 +178,6 @@ jobs:
             bazel_project: java
             os: macos-latest
 
-          - name: bazel-osx:js
-            build_system: bazel
-            bazel_project: js
-            os: macos-latest
-
           - name: bazel-osx:research
             build_system: bazel
             bazel_project: research
@@ -208,12 +199,6 @@ jobs:
             bazel_project: java
             os: windows-latest
 
-          # TODO: blocked by Bazel Closure rules issue
-          #- name: bazel-win:js
-          #  build_system: bazel
-          #  bazel_project: js
-          #  os: windows-latest
-
           - name: bazel-win:research
             build_system: bazel
             bazel_project: research

diff --git a/c/common/platform.h b/c/common/platform.h
@@ -475,7 +475,7 @@ BROTLI_MIN_MAX(size_t) BROTLI_MIN_MAX(uint32_t) BROTLI_MIN_MAX(uint8_t)
     BROTLI_INTEL_VERSION_CHECK(16, 0, 0)
 #define BROTLI_TZCNT64 __builtin_ctzll
 #elif BROTLI_MSVC_VERSION_CHECK(18, 0, 0)
-#if defined(BROTLI_TARGET_X64)
+#if defined(BROTLI_TARGET_X64) && !defined(_M_ARM64EC)
 #define BROTLI_TZCNT64 _tzcnt_u64
 #else /* BROTLI_TARGET_X64 */
 static BROTLI_INLINE uint32_t BrotliBsf64Msvc(uint64_t x) {

diff --git a/js/BUILD.bazel b/js/BUILD.bazel
diff --git a/js/WORKSPACE.bazel b/js/WORKSPACE.bazel
diff --git a/js/jasmine-polyfill.js b/js/jasmine-polyfill.js
diff --git a/js/polyfill.js b/js/polyfill.js