Switch to a more stable branch (4515)

devopvoid · Aug 18, 2021 · bb3bbfe · bb3bbfe
1 parent 1d0f7c5
commit bb3bbfe
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/webrtc-jni/pom.xml b/webrtc-jni/pom.xml
@@ -12,7 +12,7 @@
 	<packaging>pom</packaging>
 
 	<properties>
-		<webrtc.branch>branch-heads/4606</webrtc.branch>
+		<webrtc.branch>branch-heads/4515</webrtc.branch>
 		<webrtc.src.dir>${user.home}/webrtc</webrtc.src.dir>
 		<webrtc.install.dir>${user.home}/webrtc/build</webrtc.install.dir>
 		<cmake.build.type>Release</cmake.build.type>

diff --git a/webrtc-jni/src/main/cpp/dependencies/webrtc/CMakeLists.txt b/webrtc-jni/src/main/cpp/dependencies/webrtc/CMakeLists.txt
@@ -125,7 +125,7 @@ if(NOT EXISTS "${WEBRTC_SRC_DIR}/depot_tools")
 	message(STATUS "WebRTC: fetch depot tools")
 	file(MAKE_DIRECTORY ${WEBRTC_SRC_DIR})
 	execute_command(
-		COMMAND git clone --depth 1 https://chromium.googlesource.com/chromium/tools/depot_tools.git
+		COMMAND git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git
 		WORKING_DIRECTORY "${WEBRTC_SRC_DIR}"
 	)
 endif()
@@ -136,7 +136,7 @@ file(MAKE_DIRECTORY ${WEBRTC_DIR})
 
 message(STATUS "WebRTC: fetch")
 execute_command(
-	COMMAND fetch --no-history --nohooks webrtc
+	COMMAND fetch --nohooks webrtc
 	WORKING_DIRECTORY "${WEBRTC_DIR}"
 )
 
@@ -149,12 +149,6 @@ string(REPLACE
 	"${DEPS_CONTENT}")
 file(WRITE "${WEBRTC_SRC}/DEPS" "${DEPS_CONTENT}")
 
-message(STATUS "WebRTC: sync")
-execute_command(
-	COMMAND gclient sync
-	WORKING_DIRECTORY "${WEBRTC_DIR}"
-)
-
 message(STATUS "WebRTC: checkout \"${WEBRTC_BRANCH}\"")
 execute_command(
 	COMMAND git checkout .
@@ -186,6 +180,12 @@ if (PATCHES)
 	endforeach(PATCH)
 endif()
 
+message(STATUS "WebRTC: sync")
+execute_command(
+	COMMAND gclient sync
+	WORKING_DIRECTORY "${WEBRTC_DIR}"
+)
+
 message(STATUS "WebRTC: generate")
 set(COMPILE_ARGS "is_debug=false target_cpu=\"${TARGET_CPU}\" rtc_include_tests=false use_rtti=true use_custom_libcxx=false symbol_level=0 rtc_use_h264=true")
 execute_command(