commit 92ea95e34af5966555903026f45164afbd7e2088
author Mirko Bonadei <mbonadei@webrtc.org> Fri Sep 15 06:47:31 2017 +0200
committer Commit Bot <commit-bot@chromium.org> Fri Sep 15 05:02:56 2017 +0000
tree 3befb3fcfefff3b35da8a834052543338e15bcc0
parent bb547203bfebcc478b263c4e9ca173c6fd5a0c5d

Fixing WebRTC after moving from src/webrtc to src/

In https://webrtc-review.googlesource.com/c/src/+/1560 we moved WebRTC
from src/webrtc to src/ (in order to preserve an healthy git history).
This CL takes care of fixing header guards, #include paths, etc...

NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
TBR=tommi@webrtc.org


Bug: chromium:611808
Change-Id: Iea91618212bee0af16aa3f05071eab8f93706578
Reviewed-on: https://webrtc-review.googlesource.com/1561
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Henrik Kjellander <kjellander@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#19846}

rtc_base/BUILD.gn

diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn
index 9120292..31848df 100644
--- a/rtc_base/BUILD.gn
+++ b/rtc_base/BUILD.gn
@@ -209,8 +209,8 @@
     # Dependency on chromium's logging (in //base).
     deps += [ "//base:base" ]
     sources += [
-      "../../webrtc_overrides/webrtc/rtc_base/logging.cc",
-      "../../webrtc_overrides/webrtc/rtc_base/logging.h",
+      "../../webrtc_overrides/rtc_base/logging.cc",
+      "../../webrtc_overrides/rtc_base/logging.h",
     ]
   } else {
     sources += [
@@ -335,7 +335,7 @@
 rtc_source_set("rtc_task_queue_api") {
   if (build_with_chromium) {
     sources = [
-      "../../webrtc_overrides/webrtc/rtc_base/task_queue.h",
+      "../../webrtc_overrides/rtc_base/task_queue.h",
     ]
   } else {
     sources = [
@@ -354,7 +354,7 @@
   ]
   if (build_with_chromium) {
     sources = [
-      "../../webrtc_overrides/webrtc/rtc_base/task_queue.cc",
+      "../../webrtc_overrides/rtc_base/task_queue.cc",
     ]
   } else {
     if (rtc_build_libevent) {
@@ -600,7 +600,7 @@
 
   if (build_with_chromium) {
     if (is_win) {
-      sources += [ "../../webrtc_overrides/webrtc/rtc_base/win32socketinit.cc" ]
+      sources += [ "../../webrtc_overrides/rtc_base/win32socketinit.cc" ]
     }
     include_dirs = [ "../../boringssl/src/include" ]
     public_configs += [ ":rtc_base_chromium_config" ]