Skip to content

Build for Android, webrtc M70 Release #77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Build for Android, webrtc M70 Release #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.DS_Store
/out/
/out*/
/.idea/
*.gclient
*.gclient_entries
Expand Down
2 changes: 1 addition & 1 deletion CMakeModules/Version.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
21 changes: 20 additions & 1 deletion webrtc/CMakeLists.txt.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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(
Expand Down