From 2db1dbb2ca3157d6c5572d404e643a5221c649e9 Mon Sep 17 00:00:00 2001 From: "kjellander@webrtc.org" Date: Fri, 11 Mar 2016 21:34:24 -0800 Subject: [PATCH] Remove references to build_with_libjingle and libjingle_java GYP variables. These were removed a while back in https://codereview.webrtc.org/1457053003 TBR=tkchin@webrtc.org Review URL: https://codereview.webrtc.org/1790753004 . Cr-Commit-Position: refs/heads/master@{#11967} --- talk/app/webrtc/objc/README | 4 +--- webrtc/build/webrtc.gni | 11 ++--------- webrtc/examples/androidapp/README | 5 +---- 3 files changed, 4 insertions(+), 16 deletions(-) diff --git a/talk/app/webrtc/objc/README b/talk/app/webrtc/objc/README index c323e73ed1..ce2bb8ee36 100644 --- a/talk/app/webrtc/objc/README +++ b/talk/app/webrtc/objc/README @@ -11,9 +11,7 @@ Prerequisites: - Set up webrtc-related $GYP_DEFINES; example shell functions that set up for building for iOS-device, iOS-simulator, and Mac (resp) are: function wrbase() { - cd /path/to/webrtc/trunk - export GYP_DEFINES="build_with_libjingle=1 build_with_chromium=0" - export GYP_GENERATORS="ninja" + cd /path/to/webrtc/src } function wrios() { diff --git a/webrtc/build/webrtc.gni b/webrtc/build/webrtc.gni index 2b3c209869..8e1b9521f7 100644 --- a/webrtc/build/webrtc.gni +++ b/webrtc/build/webrtc.gni @@ -12,8 +12,6 @@ import("//build/config/mips.gni") import("//build_overrides/webrtc.gni") declare_args() { - build_with_libjingle = true - # Disable this to avoid building the Opus audio codec. rtc_include_opus = true @@ -58,13 +56,8 @@ declare_args() { # https://gcc.gnu.org/wiki/LinkTimeOptimization rtc_use_lto = false - if (build_with_libjingle) { - rtc_include_tests = false - rtc_restrict_logging = true - } else { - rtc_include_tests = true - rtc_restrict_logging = false - } + rtc_include_tests = false + rtc_restrict_logging = true if (is_ios) { rtc_build_libjpeg = false diff --git a/webrtc/examples/androidapp/README b/webrtc/examples/androidapp/README index 3531fa1928..856879e4d7 100644 --- a/webrtc/examples/androidapp/README +++ b/webrtc/examples/androidapp/README @@ -3,10 +3,7 @@ This directory contains an example Android client for https://apprtc.appspot.com Prerequisites: - "Getting the code" on http://www.webrtc.org/native-code/android - Set up webrtc-related GYP variables: - export GYP_DEFINES="build_with_libjingle=1 build_with_chromium=0 libjingle_java=1 - OS=android $GYP_DEFINES" - To cause WEBRTC_LOGGING to emit to Android's logcat, add enable_tracing=1 to - the $GYP_DEFINES above. + export GYP_DEFINES="OS=android $GYP_DEFINES" - When targeting both desktop & android, make sure to use a different output_dir value in $GYP_GENERATOR_FLAGS - for example export GYP_GENERATOR_FLAGS="$GYP_GENERATOR_FLAGS output_dir=out_android"