Move ViE main/test/AutoTest to test/auto_test.

Only paths in gyp and mk files are changed, source files are only moved.

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

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

src/video_engine/test/auto_test/android/Android.mk

@@ -10,11 +10,11 @@ LOCAL_PATH:= $(call my-dir)
 
 include $(CLEAR_VARS)
 
-MY_CAPTURE_FOLDER := ../../../../../modules/video_capture/main/source
+MY_CAPTURE_FOLDER := ../../../../modules/video_capture/main/source
 MY_CAPTURE_JAVA_FOLDER := Android/java/org/webrtc/videoengine
 MY_CAPTURE_PATH := $(MY_CAPTURE_FOLDER)/$(MY_CAPTURE_JAVA_FOLDER)
 
-MY_RENDER_FOLDER := ../../../../../modules/video_render/main/source
+MY_RENDER_FOLDER := ../../../../modules/video_render/main/source
 MY_RENDER_JAVA_FOLDER := Android/java/org/webrtc/videoengine
 MY_RENDER_PATH := $(MY_RENDER_FOLDER)/$(MY_RENDER_JAVA_FOLDER)
 

src/video_engine/test/auto_test/android/jni/Android.mk

@@ -9,8 +9,8 @@
 LOCAL_PATH := $(call my-dir)
 
 # the follow two lines are for NDK build
-INTERFACES_PATH := $(LOCAL_PATH)/../../../../../../../build/interface
-LIBS_PATH := $(LOCAL_PATH)/../../../../../../../build/libraries
+INTERFACES_PATH := $(LOCAL_PATH)/../../../../../../build/interface
+LIBS_PATH := $(LOCAL_PATH)/../../../../../../build/libraries
 
 include $(CLEAR_VARS)
 
@@ -46,18 +46,18 @@ LOCAL_C_INCLUDES := \
     external/gtest/include \
     $(LOCAL_PATH)/../interface \
     $(LOCAL_PATH)/../../interface \
-    $(LOCAL_PATH)/../../../../interface \
-    $(LOCAL_PATH)/../../../../source \
-    $(LOCAL_PATH)/../../../../../.. \
-    $(LOCAL_PATH)/../../../../../../common_video/interface \
-    $(LOCAL_PATH)/../../../../../../common_video/vplib/main/interface \
-    $(LOCAL_PATH)/../../../../../../modules/interface \
-    $(LOCAL_PATH)/../../../../../../modules/video_capture/main/interface \
-    $(LOCAL_PATH)/../../../../../../modules/video_capture/main/source \
-    $(LOCAL_PATH)/../../../../../../modules/video_coding/codecs/interface \
-    $(LOCAL_PATH)/../../../../../../modules/video_render/main/interface \
-    $(LOCAL_PATH)/../../../../../../voice_engine/main/interface \
-    $(LOCAL_PATH)/../../../../../../system_wrappers/interface 
+    $(LOCAL_PATH)/../../../interface \
+    $(LOCAL_PATH)/../../.. \
+    $(LOCAL_PATH)/../../../../.. \
+    $(LOCAL_PATH)/../../../../../common_video/interface \
+    $(LOCAL_PATH)/../../../../../common_video/vplib/main/interface \
+    $(LOCAL_PATH)/../../../../../modules/interface \
+    $(LOCAL_PATH)/../../../../../modules/video_capture/main/interface \
+    $(LOCAL_PATH)/../../../../../modules/video_capture/main/source \
+    $(LOCAL_PATH)/../../../../../modules/video_coding/codecs/interface \
+    $(LOCAL_PATH)/../../../../../modules/video_render/main/interface \
+    $(LOCAL_PATH)/../../../../../voice_engine/main/interface \
+    $(LOCAL_PATH)/../../../../../system_wrappers/interface 
 
 LOCAL_PRELINK_MODULE := false
 

src/video_engine/test/auto_test/source/Android.mk

@@ -12,7 +12,7 @@ LOCAL_PATH:= $(call my-dir)
 
 include $(CLEAR_VARS)
 
-include $(LOCAL_PATH)/../../../../../../android-webrtc.mk
+include $(LOCAL_PATH)/../../../../../android-webrtc.mk
 
 LOCAL_MODULE_TAGS := tests
 LOCAL_CPP_EXTENSION := .cc
@@ -41,17 +41,16 @@ LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/../interface \
     $(LOCAL_PATH)/../helpers \
     $(LOCAL_PATH)/../primitives \
-    $(LOCAL_PATH)/../../../../.. \
-    $(LOCAL_PATH)/../../../test/AutoTest/interface \
-    $(LOCAL_PATH)/../../../interface \
-    $(LOCAL_PATH)/../../../source \
-    $(LOCAL_PATH)/../../../../../modules/video_coding/codecs/interface \
-    $(LOCAL_PATH)/../../../../../system_wrappers/interface \
-    $(LOCAL_PATH)/../../../../../modules/video_render/main/interface \
-    $(LOCAL_PATH)/../../../../../modules/interface \
-    $(LOCAL_PATH)/../../../../../modules/video_capture/main/interface \
-    $(LOCAL_PATH)/../../../../../common_video/vplib/main/interface \
-    $(LOCAL_PATH)/../../../../../voice_engine/main/interface
+    $(LOCAL_PATH)/../../../.. \
+    $(LOCAL_PATH)/../../../main/interface \
+    $(LOCAL_PATH)/../../.. \
+    $(LOCAL_PATH)/../../../../modules/video_coding/codecs/interface \
+    $(LOCAL_PATH)/../../../../system_wrappers/interface \
+    $(LOCAL_PATH)/../../../../modules/video_render/main/interface \
+    $(LOCAL_PATH)/../../../../modules/interface \
+    $(LOCAL_PATH)/../../../../modules/video_capture/main/interface \
+    $(LOCAL_PATH)/../../../../common_video/vplib/main/interface \
+    $(LOCAL_PATH)/../../../../voice_engine/main/interface
 
 LOCAL_SHARED_LIBRARIES := \
     libutils \

src/video_engine/test/auto_test/vie_auto_test.gypi

@@ -25,10 +25,10 @@
         'interface/',
         'helpers/',
         'primitives',
-        '../../interface',
-        '../../..',
-        '../../../../modules/video_coding/codecs/interface',
-        '../../../../common_video/interface',
+        '../../main/interface',
+        '../..',
+        '../../../modules/video_coding/codecs/interface',
+        '../../../common_video/interface',
       ],
       'sources': [
         'interface/tb_capture_device.h',

src/video_engine/video_engine.gyp

@@ -16,7 +16,7 @@
   'conditions': [
     ['build_with_chromium==0', {
       'includes': [
-        'main/test/AutoTest/vie_auto_test.gypi',
+        'test/auto_test/vie_auto_test.gypi',
         'main/test/WindowsTest/windowstest.gypi',
       ],
     }],