Move video android test to test folder

BUG=N/A
TEST=local test
Review URL: https://webrtc-codereview.appspot.com/863005

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

src/video_engine/main/test/android_test/Android.mk

@@ -1,34 +0,0 @@
-#  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
-#
-#  Use of this source code is governed by a BSD-style license
-#  that can be found in the LICENSE file in the root of the source
-#  tree. An additional intellectual property rights grant can be found
-#  in the file PATENTS.  All contributing project authors may
-#  be found in the AUTHORS file in the root of the source tree.
-
-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := tests
-
-LOCAL_SRC_FILES := \
-    src/org/webrtc/videoengineapp/WebRTCDemo.java \
-    src/org/webrtc/videoengineapp/ViEAndroidJavaAPI.java \
-    src/org/webrtc/videoengineapp/IViEAndroidCallback.java \
-    src/org/webrtc/videoengine/CaptureCapabilityAndroid.java \
-    src/org/webrtc/videoengine/VideoCaptureAndroid.java \
-    src/org/webrtc/videoengine/VideoCaptureDeviceInfoAndroid.java \
-    src/org/webrtc/videoengine/ViEAndroidGLES20.java \
-    src/org/webrtc/videoengine/ViERenderer.java \
-    src/org/webrtc/videoengine/ViESurfaceRenderer.java \
-    src/org/webrtc/voiceengine/WebRTCAudioDevice.java
-
-LOCAL_PACKAGE_NAME := webrtc-video-demo
-LOCAL_CERTIFICATE := platform
-
-LOCAL_JNI_SHARED_LIBRARIES := libwebrtc-video-demo-jni
-
-include $(BUILD_PACKAGE)
-
-include $(call all-makefiles-under,$(LOCAL_PATH))

src/video_engine/test/android/build.xml

@@ -883,7 +883,7 @@ Notice for all the files in this folder.
                 <path refid="project.all.jars.path" />
                 <path refid="tested.project.classpath" />
             </path>
-            <property name="webrtc.modules.dir" value="../../../../modules" />
+            <property name="webrtc.modules.dir" value="../../../modules" />
             <javac encoding="${java.encoding}"
                     source="${java.source}" target="${java.target}"
                     debug="true" extdirs="" includeantruntime="false"

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

@@ -8,7 +8,7 @@
 
 LOCAL_PATH := $(call my-dir)
 
-MY_LIBS_PATH := ../../../../../../out/Debug/obj.target
+MY_LIBS_PATH := ../../../../../out/Debug/obj.target
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := libvoice_engine_core
@@ -261,9 +261,9 @@ LOCAL_CFLAGS := \
 
 LOCAL_C_INCLUDES := \
     external/gtest/include \
-    $(LOCAL_PATH)/../../../../.. \
+    $(LOCAL_PATH)/../../../.. \
-    $(LOCAL_PATH)/../../../../include \
+    $(LOCAL_PATH)/../../../include \
-    $(LOCAL_PATH)/../../../../../voice_engine/include
+    $(LOCAL_PATH)/../../../../voice_engine/include
 
 LOCAL_LDLIBS := \
     -llog \