From cb2bbce4e1920c874c76dcfcc54d6c9922c4ea4d Mon Sep 17 00:00:00 2001 From: mbonadei Date: Fri, 25 Aug 2017 08:14:04 -0700 Subject: [PATCH] Removing EXPAT_RELATIVE_PATH and rtc_relative_path. I think this was previously used in libjingle but it is not used in WebRTC. BUG=webrtc:8082 Review-Url: https://codereview.webrtc.org/2999703002 Cr-Commit-Position: refs/heads/master@{#19523} --- webrtc/BUILD.gn | 5 ----- webrtc/webrtc.gni | 3 --- 2 files changed, 8 deletions(-) diff --git a/webrtc/BUILD.gn b/webrtc/BUILD.gn index f8ffd49ee2..b5c832d4b6 100644 --- a/webrtc/BUILD.gn +++ b/webrtc/BUILD.gn @@ -43,7 +43,6 @@ config("common_inherited_config") { # TODO(kjellander): Cleanup unused ones and move defines closer to # the source when webrtc:4256 is completed. "FEATURE_ENABLE_VOICEMAIL", - "EXPAT_RELATIVE_PATH", "GTEST_RELATIVE_PATH", "WEBRTC_CHROMIUM_BUILD", ] @@ -125,10 +124,6 @@ config("common_config") { defines += [ "WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE" ] } - if (rtc_relative_path) { - defines += [ "EXPAT_RELATIVE_PATH" ] - } - if (!rtc_libvpx_build_vp9) { defines += [ "RTC_DISABLE_VP9" ] } diff --git a/webrtc/webrtc.gni b/webrtc/webrtc.gni index 72e031ee77..af4d6f97db 100644 --- a/webrtc/webrtc.gni +++ b/webrtc/webrtc.gni @@ -43,9 +43,6 @@ declare_args() { # Enable this to let the Opus audio codec change complexity on the fly. rtc_opus_variable_complexity = false - # Disable to use absolute header paths for some libraries. - rtc_relative_path = true - # Used to specify an external Jsoncpp include path when not compiling the # library that comes with WebRTC (i.e. rtc_build_json == 0). rtc_jsoncpp_root = "//third_party/jsoncpp/source/include"