From a74c08dcedf38f7fb7bf75f01e7dff93148e5b66 Mon Sep 17 00:00:00 2001
From: Henrik Kjellander <kjellander@google.com>
Date: Thu, 22 Oct 2015 12:23:11 +0200
Subject: [PATCH] Move i420 files to the right location

There's also a presubmit check that disallows .. references
in GYP files, which this solves.

BUG=webrtc:5095
R=stefan@webrtc.org

Review URL: https://codereview.webrtc.org/1418753002 .

Cr-Commit-Position: refs/heads/master@{#10371}
---
 webrtc/modules/modules.gyp                                    | 2 +-
 webrtc/modules/video_coding/BUILD.gn                          | 4 ++--
 .../modules/video_coding/codecs/i420/{main/source => }/OWNERS | 0
 .../video_coding/codecs/i420/{main/source => }/i420.cc        | 2 +-
 .../video_coding/codecs/i420/{main/source => }/i420.gypi      | 2 +-
 .../codecs/i420/{main/interface => include}/i420.h            | 0
 webrtc/modules/video_coding/main/source/codec_database.cc     | 2 +-
 7 files changed, 6 insertions(+), 6 deletions(-)
 rename webrtc/modules/video_coding/codecs/i420/{main/source => }/OWNERS (100%)
 rename webrtc/modules/video_coding/codecs/i420/{main/source => }/i420.cc (98%)
 rename webrtc/modules/video_coding/codecs/i420/{main/source => }/i420.gypi (95%)
 rename webrtc/modules/video_coding/codecs/i420/{main/interface => include}/i420.h (100%)

diff --git a/webrtc/modules/modules.gyp b/webrtc/modules/modules.gyp
index 71d200c266..2c449e4afd 100644
--- a/webrtc/modules/modules.gyp
+++ b/webrtc/modules/modules.gyp
@@ -21,7 +21,7 @@
     'rtp_rtcp/rtp_rtcp.gypi',
     'utility/utility.gypi',
     'video_coding/codecs/h264/h264.gypi',
-    'video_coding/codecs/i420/main/source/i420.gypi',
+    'video_coding/codecs/i420/i420.gypi',
     'video_coding/video_coding.gypi',
     'video_capture/video_capture.gypi',
     'video_processing/video_processing.gypi',
diff --git a/webrtc/modules/video_coding/BUILD.gn b/webrtc/modules/video_coding/BUILD.gn
index 7b3449c08a..9e8cd47e53 100644
--- a/webrtc/modules/video_coding/BUILD.gn
+++ b/webrtc/modules/video_coding/BUILD.gn
@@ -143,8 +143,8 @@ source_set("webrtc_h264") {
 
 source_set("webrtc_i420") {
   sources = [
-    "codecs/i420/main/interface/i420.h",
-    "codecs/i420/main/source/i420.cc",
+    "codecs/i420/i420.cc",
+    "codecs/i420/include/i420.h",
   ]
 
   configs += [ "../..:common_config" ]
diff --git a/webrtc/modules/video_coding/codecs/i420/main/source/OWNERS b/webrtc/modules/video_coding/codecs/i420/OWNERS
similarity index 100%
rename from webrtc/modules/video_coding/codecs/i420/main/source/OWNERS
rename to webrtc/modules/video_coding/codecs/i420/OWNERS
diff --git a/webrtc/modules/video_coding/codecs/i420/main/source/i420.cc b/webrtc/modules/video_coding/codecs/i420/i420.cc
similarity index 98%
rename from webrtc/modules/video_coding/codecs/i420/main/source/i420.cc
rename to webrtc/modules/video_coding/codecs/i420/i420.cc
index 065a2d76cc..b2f82a0e0e 100644
--- a/webrtc/modules/video_coding/codecs/i420/main/source/i420.cc
+++ b/webrtc/modules/video_coding/codecs/i420/i420.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/modules/video_coding/codecs/i420/main/interface/i420.h"
+#include "webrtc/modules/video_coding/codecs/i420/include/i420.h"
 
 #include <limits>
 #include <string>
diff --git a/webrtc/modules/video_coding/codecs/i420/main/source/i420.gypi b/webrtc/modules/video_coding/codecs/i420/i420.gypi
similarity index 95%
rename from webrtc/modules/video_coding/codecs/i420/main/source/i420.gypi
rename to webrtc/modules/video_coding/codecs/i420/i420.gypi
index 3718e8924d..4fd8e318bd 100644
--- a/webrtc/modules/video_coding/codecs/i420/main/source/i420.gypi
+++ b/webrtc/modules/video_coding/codecs/i420/i420.gypi
@@ -15,7 +15,7 @@
         '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',
       ],
       'sources': [
-        '../interface/i420.h',
+        'include/i420.h',
         'i420.cc',
       ],
     },
diff --git a/webrtc/modules/video_coding/codecs/i420/main/interface/i420.h b/webrtc/modules/video_coding/codecs/i420/include/i420.h
similarity index 100%
rename from webrtc/modules/video_coding/codecs/i420/main/interface/i420.h
rename to webrtc/modules/video_coding/codecs/i420/include/i420.h
diff --git a/webrtc/modules/video_coding/main/source/codec_database.cc b/webrtc/modules/video_coding/main/source/codec_database.cc
index 35cdbb5d7b..4c5227a388 100644
--- a/webrtc/modules/video_coding/main/source/codec_database.cc
+++ b/webrtc/modules/video_coding/main/source/codec_database.cc
@@ -18,7 +18,7 @@
 #include "webrtc/modules/video_coding/codecs/h264/include/h264.h"
 #endif
 #ifdef VIDEOCODEC_I420
-#include "webrtc/modules/video_coding/codecs/i420/main/interface/i420.h"
+#include "webrtc/modules/video_coding/codecs/i420/include/i420.h"
 #endif
 #ifdef VIDEOCODEC_VP8
 #include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h"