diff --git a/.gitignore b/.gitignore index 807e3b1..d9c73db 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ .DS_Store -/out/ +/out*/ /.idea/ *.gclient *.gclient_entries diff --git a/CMakeModules/Version.cmake b/CMakeModules/Version.cmake index 7d52305..1bed46d 100644 --- a/CMakeModules/Version.cmake +++ b/CMakeModules/Version.cmake @@ -20,4 +20,4 @@ set(LIBWEBRTC_API_VERSION set(LIBWEBRTC_VERSION ${LIBWEBRTC_API_VERSION}${LIBWEBRTC_BUILD_VERSION}) -set(LIBWEBRTC_WEBRTC_HEAD refs/branch-heads/60) +set(LIBWEBRTC_WEBRTC_HEAD refs/branch-heads/70) diff --git a/webrtc/CMakeLists.txt.in b/webrtc/CMakeLists.txt.in index b6c3874..08b15b4 100644 --- a/webrtc/CMakeLists.txt.in +++ b/webrtc/CMakeLists.txt.in @@ -76,11 +76,21 @@ if (UNIX AND NOT APPLE) set(SYSROOT_ARCH "amd64") elseif (SYSROOT_ARCH STREQUAL "x86") set(SYSROOT_ARCH "i386") + elseif (SYSROOT_ARCH STREQUAL "arm64") + if (TARGET_OS STREQUAL "android") + set(SYSROOT_ARCH ${CMAKE_HOST_SYSTEM_PROCESSOR}) + if (SYSROOT_ARCH STREQUAL "x86_64") + set(SYSROOT_ARCH "amd64") + elseif (SYSROOT_ARCH STQEQUAL "x86") + set(SYSROOT_ARCH "i386") + endif() + endif() endif (SYSROOT_ARCH STREQUAL "x64") + libwebrtc_command( NAME webrtc-toolchain - COMMAND ${PYTHON_EXECUTABLE} ${WEBRTC_PARENT_DIR}/src/build/linux/sysroot_scripts/install-sysroot.py --arch=${SYSROOT_ARCH} --running-as-hook + COMMAND ${PYTHON_EXECUTABLE} ${WEBRTC_PARENT_DIR}/src/build/linux/sysroot_scripts/install-sysroot.py --arch=${SYSROOT_ARCH} WORKING_DIRECTORY "${WEBRTC_PARENT_DIR}" COMMENT "Retrieving sysroot" DEPENDS webrtc-sync @@ -134,6 +144,15 @@ libwebrtc_command( ) set(_DEPENDENCIES ${_DEPENDENCIES} webrtc-clang-format) +libwebrtc_command( + NAME webrtc-util-lastchange + COMMAND ${PYTHON_EXECUTABLE} src/build/util/lastchange.py -o src/build/util/LASTCHANGE + WORKING_DIRECTORY "${WEBRTC_PARENT_DIR}" + COMMENT "Generating build util LASTCHANGE file" + DEPENDS ${_DEPENDENCIES} +) +set(_DEPENDENCIES ${_DEPENDENCIES} webrtc-util-lastchange) + include(Gn) libwebrtc_command(