Merge branch 'feature/m118.5993'

shiguredo-webrtc-build · Oct 4, 2023 · ca1b027 · ca1b027
2 parents 15e86b8 + b3e2813
commit ca1b027
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/VERSION b/VERSION
@@ -1,4 +1,4 @@
-WEBRTC_BUILD_VERSION=117.5938.2.0
-WEBRTC_VERSION=117.5938.2
-WEBRTC_READABLE_VERSION=M117.5938@{#2}
-WEBRTC_COMMIT=70aa7e99e4af06e9a2273793179dfcfddad11898
+WEBRTC_BUILD_VERSION=118.5993.2.0
+WEBRTC_VERSION=118.5993.2
+WEBRTC_READABLE_VERSION=M118.5993@{#2}
+WEBRTC_COMMIT=597e7ba370a973f64f822aa247cb2355de7c5f47
diff --git a/run.py b/run.py
@@ -761,9 +761,9 @@ def generate_version_info(webrtc_src_dir, webrtc_package_dir):
         (['.'], ''),
         (['build'], 'BUILD'),
         (['buildtools'], 'BUILDTOOLS'),
-        (['buildtools', 'third_party', 'libc++', 'trunk'], 'BUILDTOOLS_THIRD_PARTY_LIBCXX_TRUNK'),
-        (['buildtools', 'third_party', 'libc++abi', 'trunk'], 'BUILDTOOLS_THIRD_PARTY_LIBCXXABI_TRUNK'),
-        (['buildtools', 'third_party', 'libunwind', 'trunk'], 'BUILDTOOLS_THIRD_PARTY_LIBUNWIND_TRUNK'),
+        (['third_party', 'libc++', 'src'], 'WEBRTC_SRC_THIRD_PARTY_LIBCXX_SRC'),
+        (['third_party', 'libc++abi', 'src'], 'WEBRTC_SRC_THIRD_PARTY_LIBCXXABI_SRC'),
+        (['third_party', 'libunwind', 'src'], 'WEBRTC_SRC_THIRD_PARTY_LIBUNWIND_SRC'),
         (['third_party'], 'THIRD_PARTY'),
         (['tools'], 'TOOLS'),
     ]