Build GN manually to support i386 builds

Author: roehling

webrtc/CMakeLists.txt

@@ -31,6 +31,16 @@ if(NOT ${get_webrtc_source_result} EQUAL 0)
     message(FATAL_ERROR "cannot update WebRTC source code")
 endif()
 
+message(STATUS "Fetching latest GN build tool from Google")
+execute_process(
+    COMMAND "build/get_gn"
+    WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+    RESULT_VARIABLE get_gn_result
+)
+if(NOT ${get_gn_result} EQUAL 0)
+    message(FATAL_ERROR "cannot update GN build tool")
+endif()
+
 message(STATUS "Configuring WebRTC build system")
 execute_process(
     COMMAND "build/prepare_webrtc_build" "${CMAKE_CURRENT_BINARY_DIR}/ninja"

webrtc/build/get_gn

@@ -0,0 +1,19 @@
+#!/bin/bash
+set -e
+rootdir="$(cd "$(dirname "$0")"; pwd)"
+cd "$rootdir"
+
+if ! webrtc/src/buildtools/linux64/gn --help &>/dev/null
+then
+	# cd "$rootdir/webrtc"
+	# download_from_google_storage --no_resume --platform='linux*' --no_auth --bucket chromium-gn -s src/buildtools/linux64/gn.sha1
+	if [ ! -d gn ]
+	then
+		git clone https://gn.googlesource.com/gn
+	fi
+	cd gn
+	CC=gcc CXX=g++ LDFLAGS=-fuse-ld=gold python build/gen.py
+	ninja -C out
+	cp out/gn ../webrtc/src/buildtools/linux64
+fi
+

webrtc/build/get_webrtc_source

@@ -10,11 +10,8 @@ then
 	cd "$rootdir/webrtc"
 	fetch --nohooks webrtc
 	gclient sync --nohooks --revision "$revision"
-	download_from_google_storage --no_resume --platform='linux*' --no_auth --bucket chromium-gn -s src/buildtools/linux64/gn.sha1
 elif [ "$run_updates" -eq 1 ]
 then
 	cd "$rootdir/webrtc"
 	gclient sync --nohooks --revision "$revision"
-	download_from_google_storage --no_resume --platform='linux*' --no_auth --bucket chromium-gn -s src/buildtools/linux64/gn.sha1
 fi
-

webrtc/build/prepare_webrtc_build

@@ -3,6 +3,20 @@ set -e
 rootdir="$(cd "$(dirname "$0")"; pwd)"
 export PATH="$rootdir/depot_tools:$PATH"
 
+THIS_ARCH="$(dpkg-architecture -qDEB_TARGET_ARCH || uname -m)"
+case "$THIS_ARCH" in
+	i?86)
+		THIS_ARCH=x86
+		;;
+	x86_64|amd64)
+		THIS_ARCH=x64
+		;;
+	*)
+		echo>&2 "Unknown target platform: $THIS_ARCH"
+		exit 1
+		;;
+esac
+
 cd "$rootdir/webrtc/src"
-gn gen "$1" --args='is_debug=false is_clang=false is_desktop_linux=false treat_warnings_as_errors=false fatal_linker_warnings=false use_gconf=false use_gio=false use_rtti=true linux_use_bundled_binutils=false use_sysroot=false'
+gn gen "$1" --args='is_debug=false is_clang=false is_desktop_linux=false is_android=false treat_warnings_as_errors=false fatal_linker_warnings=false use_gconf=false use_gio=false use_rtti=true linux_use_bundled_binutils=false rtc_enable_protobuf=false rtc_include_tests=false use_sysroot=false current_cpu="'$THIS_ARCH'" target_cpu="'$THIS_ARCH'"'
 

webrtc/package.xml

@@ -16,6 +16,7 @@
   <buildtool_depend>git</buildtool_depend>
   <buildtool_depend>ninja-build</buildtool_depend>
   <buildtool_depend>cmake</buildtool_depend>
+  <depend>gtk2</depend>
   <depend>gtk3</depend>
   <depend>libasound2-dev</depend>
   <depend>libglib-dev</depend>