Move video_engine/source* to video_engine/. No code changes except paths in gyp-files.

Review URL: http://webrtc-codereview.appspot.com/283002

git-svn-id: http://webrtc.googlecode.com/svn/trunk@984 4adac7df-926f-26a2-2b94-8c16560cd09d

src/video_engine/Android.mk

@@ -10,7 +10,7 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
-include $(LOCAL_PATH)/../../../../android-webrtc.mk
+include $(LOCAL_PATH)/../../android-webrtc.mk
 
 LOCAL_ARM_MODE := arm
 LOCAL_MODULE := libwebrtc_vie_core
@@ -52,27 +52,27 @@ LOCAL_CFLAGS := \
     $(MY_WEBRTC_COMMON_DEFS)
 
 LOCAL_C_INCLUDES := \
-    $(LOCAL_PATH)/../interface \
-    $(LOCAL_PATH)/../../.. \
-    $(LOCAL_PATH)/../../../common_video/interface \
-    $(LOCAL_PATH)/../../../common_video/jpeg/main/interface \
-    $(LOCAL_PATH)/../../../common_video/vplib/main/interface \
-    $(LOCAL_PATH)/../../../modules/interface \
-    $(LOCAL_PATH)/../../../modules/audio_coding/main/interface \
-    $(LOCAL_PATH)/../../../modules/media_file/interface \
-    $(LOCAL_PATH)/../../../modules/rtp_rtcp/interface \
-    $(LOCAL_PATH)/../../../modules/udp_transport/interface \
-    $(LOCAL_PATH)/../../../modules/utility/interface \
-    $(LOCAL_PATH)/../../../modules/video_capture/main/interface \
-    $(LOCAL_PATH)/../../../modules/video_capture/main/source \
-    $(LOCAL_PATH)/../../../modules/video_capture/main/source/Android \
-    $(LOCAL_PATH)/../../../modules/video_coding/codecs/interface \
-    $(LOCAL_PATH)/../../../modules/video_coding/main/interface \
-    $(LOCAL_PATH)/../../../modules/video_mixer/main/interface \
-    $(LOCAL_PATH)/../../../modules/video_processing/main/interface \
-    $(LOCAL_PATH)/../../../modules/video_render/main/interface \
-    $(LOCAL_PATH)/../../../system_wrappers/interface \
-    $(LOCAL_PATH)/../../../voice_engine/main/interface
+    $(LOCAL_PATH)/main/interface \
+    $(LOCAL_PATH)/.. \
+    $(LOCAL_PATH)/../common_video/interface \
+    $(LOCAL_PATH)/../common_video/jpeg/main/interface \
+    $(LOCAL_PATH)/../common_video/vplib/main/interface \
+    $(LOCAL_PATH)/../modules/interface \
+    $(LOCAL_PATH)/../modules/audio_coding/main/interface \
+    $(LOCAL_PATH)/../modules/media_file/interface \
+    $(LOCAL_PATH)/../modules/rtp_rtcp/interface \
+    $(LOCAL_PATH)/../modules/udp_transport/interface \
+    $(LOCAL_PATH)/../modules/utility/interface \
+    $(LOCAL_PATH)/../modules/video_capture/main/interface \
+    $(LOCAL_PATH)/../modules/video_capture/main/source \
+    $(LOCAL_PATH)/../modules/video_capture/main/source/Android \
+    $(LOCAL_PATH)/../modules/video_coding/codecs/interface \
+    $(LOCAL_PATH)/../modules/video_coding/main/interface \
+    $(LOCAL_PATH)/../modules/video_mixer/main/interface \
+    $(LOCAL_PATH)/../modules/video_processing/main/interface \
+    $(LOCAL_PATH)/../modules/video_render/main/interface \
+    $(LOCAL_PATH)/../system_wrappers/interface \
+    $(LOCAL_PATH)/../voice_engine/main/interface
 
 LOCAL_SHARED_LIBRARIES := \
     libcutils \

src/video_engine/main/test/AutoTest/vie_auto_test.gypi

@@ -26,7 +26,7 @@
         'helpers/',
         'primitives',
         '../../interface',
-        '../../source',
+        '../../../',
         '../../../../modules/video_coding/codecs/interface/',
         '../../../../common_video/interface/',
       ],
@@ -44,13 +44,13 @@
         'interface/vie_autotest_main.h',
         'interface/vie_autotest_window_manager_interface.h',
         'interface/vie_autotest_windows.h',
-        
+
         # Helper classes
         'helpers/vie_fake_camera.cc',
         'helpers/vie_file_capture_device.cc',
         'helpers/vie_to_file_renderer.cc',
         'helpers/vie_window_creator.cc',
-        
+
         # New, fully automated tests
         'automated/vie_api_integration_test.cc',
         'automated/vie_comparison_test.cc',

src/video_engine/video_engine.gyp

@@ -9,7 +9,7 @@
 {
   'includes': [
     '../build/common.gypi',
-    'main/source/video_engine_core.gypi',
+    './video_engine_core.gypi',
   ],
 
   # Test targets, excluded when building with Chromium.

src/video_engine/video_engine_core.gypi

@@ -35,29 +35,29 @@
         '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
       ],
       'include_dirs': [
-        '../interface',
-        '../../../common_video/interface',
-        '../../../modules/video_capture/main/interface',
-        '../../../modules/video_render/main/interface',
+        'main/interface',
+        '../common_video/interface',
+        '../modules/video_capture/main/interface',
+        '../modules/video_render/main/interface',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
-          '../interface',
+          'main/interface',
         ],
       },
       'sources': [
         # interface
-        '../interface/vie_base.h',
-        '../interface/vie_capture.h',
-        '../interface/vie_codec.h',
-        '../interface/vie_encryption.h',
-        '../interface/vie_errors.h',
-        '../interface/vie_external_codec.h',
-        '../interface/vie_file.h',
-        '../interface/vie_image_process.h',
-        '../interface/vie_network.h',
-        '../interface/vie_render.h',
-        '../interface/vie_rtp_rtcp.h',
+        'main/interface/vie_base.h',
+        'main/interface/vie_capture.h',
+        'main/interface/vie_codec.h',
+        'main/interface/vie_encryption.h',
+        'main/interface/vie_errors.h',
+        'main/interface/vie_external_codec.h',
+        'main/interface/vie_file.h',
+        'main/interface/vie_image_process.h',
+        'main/interface/vie_network.h',
+        'main/interface/vie_render.h',
+        'main/interface/vie_rtp_rtcp.h',
 
         # headers
         'vie_base_impl.h',