Skip to content

Commit 3fd9ffa

Browse files
committed
Fixed WebRTC cmake build
1 parent c9fc55e commit 3fd9ffa

File tree

1 file changed

+6
-15
lines changed

1 file changed

+6
-15
lines changed

webrtc-jni/src/main/cpp/dependencies/webrtc/CMakeLists.txt

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -140,15 +140,6 @@ execute_command(
140140
WORKING_DIRECTORY "${WEBRTC_DIR}"
141141
)
142142

143-
# Patch DEPS to reduce time running gclient
144-
file(READ "${WEBRTC_SRC}/DEPS" DEPS_CONTENT)
145-
string(REPLACE
146-
"'src/resources'],"
147-
"'src/resources'],'condition': 'rtc_include_tests==true',"
148-
DEPS_CONTENT
149-
"${DEPS_CONTENT}")
150-
file(WRITE "${WEBRTC_SRC}/DEPS" "${DEPS_CONTENT}")
151-
152143
message(STATUS "WebRTC: checkout \"${WEBRTC_BRANCH}\"")
153144
execute_command(
154145
COMMAND git checkout .
@@ -159,6 +150,12 @@ execute_command(
159150
WORKING_DIRECTORY "${WEBRTC_SRC}"
160151
)
161152

153+
message(STATUS "WebRTC: sync")
154+
execute_command(
155+
COMMAND gclient sync
156+
WORKING_DIRECTORY "${WEBRTC_DIR}"
157+
)
158+
162159
file(GLOB PATCHES "${CMAKE_CURRENT_LIST_DIR}/patches/${SOURCE_TARGET}/*.patch")
163160

164161
if (PATCHES)
@@ -180,12 +177,6 @@ if (PATCHES)
180177
endforeach(PATCH)
181178
endif()
182179

183-
message(STATUS "WebRTC: sync")
184-
execute_command(
185-
COMMAND gclient sync
186-
WORKING_DIRECTORY "${WEBRTC_DIR}"
187-
)
188-
189180
message(STATUS "WebRTC: generate")
190181
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")
191182
execute_command(

0 commit comments

Comments
 (0)