From dfe89e337ede2863e1695d42fc031e47b7bf5dad Mon Sep 17 00:00:00 2001 From: "mflodman@webrtc.org" Date: Tue, 22 Nov 2011 14:03:15 +0000 Subject: [PATCH] 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 --- .../auto_test}/android/.classpath | 0 .../auto_test}/android/.project | 0 .../auto_test}/android/Android.mk | 4 +-- .../auto_test}/android/AndroidManifest.xml | 0 .../auto_test}/android/default.properties | 0 .../android/gen/org/webrtc/vieautotest/R.java | 0 .../auto_test}/android/jni/Android.mk | 28 +++++++++--------- .../jni/org_webrtc_vieautotest_vie_autotest.h | 0 .../android/jni/vie_autotest_jni.cc | 0 .../auto_test}/android/res/drawable/logo.png | Bin .../auto_test}/android/res/layout/main.xml | 0 .../auto_test}/android/res/values/strings.xml | 0 .../org/webrtc/vieautotest/ViEAutotest.java | 0 .../automated/vie_api_integration_test.cc | 0 .../automated/vie_comparison_test.cc | 0 .../vie_extended_integration_test.cc | 0 .../automated/vie_integration_test_base.cc | 0 .../automated/vie_integration_test_base.h | 0 .../vie_standard_integration_test.cc | 0 .../auto_test}/helpers/vie_fake_camera.cc | 0 .../auto_test}/helpers/vie_fake_camera.h | 0 .../helpers/vie_file_capture_device.cc | 0 .../helpers/vie_file_capture_device.h | 0 .../helpers/vie_to_file_renderer.cc | 0 .../auto_test}/helpers/vie_to_file_renderer.h | 0 .../auto_test}/helpers/vie_window_creator.cc | 0 .../auto_test}/helpers/vie_window_creator.h | 0 .../auto_test}/interface/tb_I420_codec.h | 0 .../auto_test}/interface/tb_capture_device.h | 0 .../interface/tb_external_transport.h | 0 .../auto_test}/interface/tb_interfaces.h | 0 .../auto_test}/interface/tb_video_channel.h | 0 .../auto_test}/interface/vie_autotest.h | 0 .../interface/vie_autotest_android.h | 0 .../interface/vie_autotest_defines.h | 0 .../auto_test}/interface/vie_autotest_linux.h | 0 .../interface/vie_autotest_mac_carbon.h | 0 .../interface/vie_autotest_mac_cocoa.h | 0 .../auto_test}/interface/vie_autotest_main.h | 0 .../vie_autotest_window_manager_interface.h | 0 .../interface/vie_autotest_windows.h | 0 .../interface/vie_comparison_tests.h | 0 .../interface/vie_window_manager_factory.h | 0 .../auto_test}/media/captureDeviceImage.bmp | Bin .../auto_test}/media/captureDeviceImage.jpg | Bin .../auto_test}/media/renderStartImage.bmp | Bin .../auto_test}/media/renderStartImage.jpg | Bin .../auto_test}/media/renderTimeoutImage.bmp | Bin .../auto_test}/media/renderTimeoutImage.jpg | Bin .../auto_test}/primitives/base_primitives.cc | 0 .../auto_test}/primitives/base_primitives.h | 0 .../auto_test}/primitives/codec_primitives.cc | 0 .../auto_test}/primitives/codec_primitives.h | 0 .../primitives/general_primitives.cc | 0 .../primitives/general_primitives.h | 0 .../auto_test}/source/Android.mk | 23 +++++++------- .../auto_test}/source/tb_I420_codec.cc | 0 .../auto_test}/source/tb_capture_device.cc | 0 .../source/tb_external_transport.cc | 0 .../auto_test}/source/tb_interfaces.cc | 0 .../auto_test}/source/tb_video_channel.cc | 0 .../auto_test}/source/vie_autotest.cc | 0 .../auto_test}/source/vie_autotest_android.cc | 0 .../auto_test}/source/vie_autotest_base.cc | 0 .../auto_test}/source/vie_autotest_capture.cc | 0 .../auto_test}/source/vie_autotest_codec.cc | 0 .../source/vie_autotest_custom_call.cc | 0 .../source/vie_autotest_encryption.cc | 0 .../auto_test}/source/vie_autotest_file.cc | 0 .../source/vie_autotest_image_process.cc | 0 .../auto_test}/source/vie_autotest_linux.cc | 0 .../source/vie_autotest_loopback.cc | 0 .../source/vie_autotest_mac_carbon.cc | 0 .../source/vie_autotest_mac_cocoa.mm | 0 .../auto_test}/source/vie_autotest_main.cc | 0 .../auto_test}/source/vie_autotest_network.cc | 0 .../auto_test}/source/vie_autotest_render.cc | 0 .../source/vie_autotest_rtp_rtcp.cc | 0 .../source/vie_autotest_simulcast.cc | 0 .../auto_test}/source/vie_autotest_windows.cc | 0 .../auto_test}/source/vie_comparison_tests.cc | 0 .../vie_window_manager_factory_linux.cc | 0 .../source/vie_window_manager_factory_mac.mm | 0 .../source/vie_window_manager_factory_win.cc | 0 .../auto_test}/vie_auto_test.gypi | 8 ++--- src/video_engine/video_engine.gyp | 2 +- 86 files changed, 32 insertions(+), 33 deletions(-) rename src/video_engine/{main/test/AutoTest => test/auto_test}/android/.classpath (100%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/android/.project (100%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/android/Android.mk (90%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/android/AndroidManifest.xml (100%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/android/default.properties (100%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/android/gen/org/webrtc/vieautotest/R.java (100%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/android/jni/Android.mk (67%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/android/jni/org_webrtc_vieautotest_vie_autotest.h (100%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/android/jni/vie_autotest_jni.cc (100%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/android/res/drawable/logo.png (100%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/android/res/layout/main.xml (100%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/android/res/values/strings.xml (100%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/android/src/org/webrtc/vieautotest/ViEAutotest.java (100%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/automated/vie_api_integration_test.cc (100%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/automated/vie_comparison_test.cc (100%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/automated/vie_extended_integration_test.cc (100%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/automated/vie_integration_test_base.cc (100%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/automated/vie_integration_test_base.h (100%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/automated/vie_standard_integration_test.cc (100%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/helpers/vie_fake_camera.cc (100%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/helpers/vie_fake_camera.h (100%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/helpers/vie_file_capture_device.cc (100%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/helpers/vie_file_capture_device.h (100%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/helpers/vie_to_file_renderer.cc (100%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/helpers/vie_to_file_renderer.h (100%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/helpers/vie_window_creator.cc (100%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/helpers/vie_window_creator.h (100%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/interface/tb_I420_codec.h (100%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/interface/tb_capture_device.h (100%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/interface/tb_external_transport.h (100%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/interface/tb_interfaces.h (100%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/interface/tb_video_channel.h (100%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/interface/vie_autotest.h (100%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/interface/vie_autotest_android.h (100%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/interface/vie_autotest_defines.h (100%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/interface/vie_autotest_linux.h (100%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/interface/vie_autotest_mac_carbon.h (100%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/interface/vie_autotest_mac_cocoa.h (100%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/interface/vie_autotest_main.h (100%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/interface/vie_autotest_window_manager_interface.h (100%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/interface/vie_autotest_windows.h (100%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/interface/vie_comparison_tests.h (100%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/interface/vie_window_manager_factory.h (100%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/media/captureDeviceImage.bmp (100%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/media/captureDeviceImage.jpg (100%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/media/renderStartImage.bmp (100%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/media/renderStartImage.jpg (100%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/media/renderTimeoutImage.bmp (100%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/media/renderTimeoutImage.jpg (100%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/primitives/base_primitives.cc (100%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/primitives/base_primitives.h (100%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/primitives/codec_primitives.cc (100%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/primitives/codec_primitives.h (100%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/primitives/general_primitives.cc (100%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/primitives/general_primitives.h (100%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/source/Android.mk (67%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/source/tb_I420_codec.cc (100%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/source/tb_capture_device.cc (100%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/source/tb_external_transport.cc (100%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/source/tb_interfaces.cc (100%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/source/tb_video_channel.cc (100%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/source/vie_autotest.cc (100%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/source/vie_autotest_android.cc (100%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/source/vie_autotest_base.cc (100%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/source/vie_autotest_capture.cc (100%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/source/vie_autotest_codec.cc (100%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/source/vie_autotest_custom_call.cc (100%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/source/vie_autotest_encryption.cc (100%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/source/vie_autotest_file.cc (100%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/source/vie_autotest_image_process.cc (100%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/source/vie_autotest_linux.cc (100%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/source/vie_autotest_loopback.cc (100%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/source/vie_autotest_mac_carbon.cc (100%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/source/vie_autotest_mac_cocoa.mm (100%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/source/vie_autotest_main.cc (100%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/source/vie_autotest_network.cc (100%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/source/vie_autotest_render.cc (100%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/source/vie_autotest_rtp_rtcp.cc (100%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/source/vie_autotest_simulcast.cc (100%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/source/vie_autotest_windows.cc (100%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/source/vie_comparison_tests.cc (100%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/source/vie_window_manager_factory_linux.cc (100%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/source/vie_window_manager_factory_mac.mm (100%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/source/vie_window_manager_factory_win.cc (100%) rename src/video_engine/{main/test/AutoTest => test/auto_test}/vie_auto_test.gypi (97%) diff --git a/src/video_engine/main/test/AutoTest/android/.classpath b/src/video_engine/test/auto_test/android/.classpath similarity index 100% rename from src/video_engine/main/test/AutoTest/android/.classpath rename to src/video_engine/test/auto_test/android/.classpath diff --git a/src/video_engine/main/test/AutoTest/android/.project b/src/video_engine/test/auto_test/android/.project similarity index 100% rename from src/video_engine/main/test/AutoTest/android/.project rename to src/video_engine/test/auto_test/android/.project diff --git a/src/video_engine/main/test/AutoTest/android/Android.mk b/src/video_engine/test/auto_test/android/Android.mk similarity index 90% rename from src/video_engine/main/test/AutoTest/android/Android.mk rename to src/video_engine/test/auto_test/android/Android.mk index 5570714d5..2b20e8054 100644 --- a/src/video_engine/main/test/AutoTest/android/Android.mk +++ b/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) diff --git a/src/video_engine/main/test/AutoTest/android/AndroidManifest.xml b/src/video_engine/test/auto_test/android/AndroidManifest.xml similarity index 100% rename from src/video_engine/main/test/AutoTest/android/AndroidManifest.xml rename to src/video_engine/test/auto_test/android/AndroidManifest.xml diff --git a/src/video_engine/main/test/AutoTest/android/default.properties b/src/video_engine/test/auto_test/android/default.properties similarity index 100% rename from src/video_engine/main/test/AutoTest/android/default.properties rename to src/video_engine/test/auto_test/android/default.properties diff --git a/src/video_engine/main/test/AutoTest/android/gen/org/webrtc/vieautotest/R.java b/src/video_engine/test/auto_test/android/gen/org/webrtc/vieautotest/R.java similarity index 100% rename from src/video_engine/main/test/AutoTest/android/gen/org/webrtc/vieautotest/R.java rename to src/video_engine/test/auto_test/android/gen/org/webrtc/vieautotest/R.java diff --git a/src/video_engine/main/test/AutoTest/android/jni/Android.mk b/src/video_engine/test/auto_test/android/jni/Android.mk similarity index 67% rename from src/video_engine/main/test/AutoTest/android/jni/Android.mk rename to src/video_engine/test/auto_test/android/jni/Android.mk index 002442787..ac439752b 100644 --- a/src/video_engine/main/test/AutoTest/android/jni/Android.mk +++ b/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 diff --git a/src/video_engine/main/test/AutoTest/android/jni/org_webrtc_vieautotest_vie_autotest.h b/src/video_engine/test/auto_test/android/jni/org_webrtc_vieautotest_vie_autotest.h similarity index 100% rename from src/video_engine/main/test/AutoTest/android/jni/org_webrtc_vieautotest_vie_autotest.h rename to src/video_engine/test/auto_test/android/jni/org_webrtc_vieautotest_vie_autotest.h diff --git a/src/video_engine/main/test/AutoTest/android/jni/vie_autotest_jni.cc b/src/video_engine/test/auto_test/android/jni/vie_autotest_jni.cc similarity index 100% rename from src/video_engine/main/test/AutoTest/android/jni/vie_autotest_jni.cc rename to src/video_engine/test/auto_test/android/jni/vie_autotest_jni.cc diff --git a/src/video_engine/main/test/AutoTest/android/res/drawable/logo.png b/src/video_engine/test/auto_test/android/res/drawable/logo.png similarity index 100% rename from src/video_engine/main/test/AutoTest/android/res/drawable/logo.png rename to src/video_engine/test/auto_test/android/res/drawable/logo.png diff --git a/src/video_engine/main/test/AutoTest/android/res/layout/main.xml b/src/video_engine/test/auto_test/android/res/layout/main.xml similarity index 100% rename from src/video_engine/main/test/AutoTest/android/res/layout/main.xml rename to src/video_engine/test/auto_test/android/res/layout/main.xml diff --git a/src/video_engine/main/test/AutoTest/android/res/values/strings.xml b/src/video_engine/test/auto_test/android/res/values/strings.xml similarity index 100% rename from src/video_engine/main/test/AutoTest/android/res/values/strings.xml rename to src/video_engine/test/auto_test/android/res/values/strings.xml diff --git a/src/video_engine/main/test/AutoTest/android/src/org/webrtc/vieautotest/ViEAutotest.java b/src/video_engine/test/auto_test/android/src/org/webrtc/vieautotest/ViEAutotest.java similarity index 100% rename from src/video_engine/main/test/AutoTest/android/src/org/webrtc/vieautotest/ViEAutotest.java rename to src/video_engine/test/auto_test/android/src/org/webrtc/vieautotest/ViEAutotest.java diff --git a/src/video_engine/main/test/AutoTest/automated/vie_api_integration_test.cc b/src/video_engine/test/auto_test/automated/vie_api_integration_test.cc similarity index 100% rename from src/video_engine/main/test/AutoTest/automated/vie_api_integration_test.cc rename to src/video_engine/test/auto_test/automated/vie_api_integration_test.cc diff --git a/src/video_engine/main/test/AutoTest/automated/vie_comparison_test.cc b/src/video_engine/test/auto_test/automated/vie_comparison_test.cc similarity index 100% rename from src/video_engine/main/test/AutoTest/automated/vie_comparison_test.cc rename to src/video_engine/test/auto_test/automated/vie_comparison_test.cc diff --git a/src/video_engine/main/test/AutoTest/automated/vie_extended_integration_test.cc b/src/video_engine/test/auto_test/automated/vie_extended_integration_test.cc similarity index 100% rename from src/video_engine/main/test/AutoTest/automated/vie_extended_integration_test.cc rename to src/video_engine/test/auto_test/automated/vie_extended_integration_test.cc diff --git a/src/video_engine/main/test/AutoTest/automated/vie_integration_test_base.cc b/src/video_engine/test/auto_test/automated/vie_integration_test_base.cc similarity index 100% rename from src/video_engine/main/test/AutoTest/automated/vie_integration_test_base.cc rename to src/video_engine/test/auto_test/automated/vie_integration_test_base.cc diff --git a/src/video_engine/main/test/AutoTest/automated/vie_integration_test_base.h b/src/video_engine/test/auto_test/automated/vie_integration_test_base.h similarity index 100% rename from src/video_engine/main/test/AutoTest/automated/vie_integration_test_base.h rename to src/video_engine/test/auto_test/automated/vie_integration_test_base.h diff --git a/src/video_engine/main/test/AutoTest/automated/vie_standard_integration_test.cc b/src/video_engine/test/auto_test/automated/vie_standard_integration_test.cc similarity index 100% rename from src/video_engine/main/test/AutoTest/automated/vie_standard_integration_test.cc rename to src/video_engine/test/auto_test/automated/vie_standard_integration_test.cc diff --git a/src/video_engine/main/test/AutoTest/helpers/vie_fake_camera.cc b/src/video_engine/test/auto_test/helpers/vie_fake_camera.cc similarity index 100% rename from src/video_engine/main/test/AutoTest/helpers/vie_fake_camera.cc rename to src/video_engine/test/auto_test/helpers/vie_fake_camera.cc diff --git a/src/video_engine/main/test/AutoTest/helpers/vie_fake_camera.h b/src/video_engine/test/auto_test/helpers/vie_fake_camera.h similarity index 100% rename from src/video_engine/main/test/AutoTest/helpers/vie_fake_camera.h rename to src/video_engine/test/auto_test/helpers/vie_fake_camera.h diff --git a/src/video_engine/main/test/AutoTest/helpers/vie_file_capture_device.cc b/src/video_engine/test/auto_test/helpers/vie_file_capture_device.cc similarity index 100% rename from src/video_engine/main/test/AutoTest/helpers/vie_file_capture_device.cc rename to src/video_engine/test/auto_test/helpers/vie_file_capture_device.cc diff --git a/src/video_engine/main/test/AutoTest/helpers/vie_file_capture_device.h b/src/video_engine/test/auto_test/helpers/vie_file_capture_device.h similarity index 100% rename from src/video_engine/main/test/AutoTest/helpers/vie_file_capture_device.h rename to src/video_engine/test/auto_test/helpers/vie_file_capture_device.h diff --git a/src/video_engine/main/test/AutoTest/helpers/vie_to_file_renderer.cc b/src/video_engine/test/auto_test/helpers/vie_to_file_renderer.cc similarity index 100% rename from src/video_engine/main/test/AutoTest/helpers/vie_to_file_renderer.cc rename to src/video_engine/test/auto_test/helpers/vie_to_file_renderer.cc diff --git a/src/video_engine/main/test/AutoTest/helpers/vie_to_file_renderer.h b/src/video_engine/test/auto_test/helpers/vie_to_file_renderer.h similarity index 100% rename from src/video_engine/main/test/AutoTest/helpers/vie_to_file_renderer.h rename to src/video_engine/test/auto_test/helpers/vie_to_file_renderer.h diff --git a/src/video_engine/main/test/AutoTest/helpers/vie_window_creator.cc b/src/video_engine/test/auto_test/helpers/vie_window_creator.cc similarity index 100% rename from src/video_engine/main/test/AutoTest/helpers/vie_window_creator.cc rename to src/video_engine/test/auto_test/helpers/vie_window_creator.cc diff --git a/src/video_engine/main/test/AutoTest/helpers/vie_window_creator.h b/src/video_engine/test/auto_test/helpers/vie_window_creator.h similarity index 100% rename from src/video_engine/main/test/AutoTest/helpers/vie_window_creator.h rename to src/video_engine/test/auto_test/helpers/vie_window_creator.h diff --git a/src/video_engine/main/test/AutoTest/interface/tb_I420_codec.h b/src/video_engine/test/auto_test/interface/tb_I420_codec.h similarity index 100% rename from src/video_engine/main/test/AutoTest/interface/tb_I420_codec.h rename to src/video_engine/test/auto_test/interface/tb_I420_codec.h diff --git a/src/video_engine/main/test/AutoTest/interface/tb_capture_device.h b/src/video_engine/test/auto_test/interface/tb_capture_device.h similarity index 100% rename from src/video_engine/main/test/AutoTest/interface/tb_capture_device.h rename to src/video_engine/test/auto_test/interface/tb_capture_device.h diff --git a/src/video_engine/main/test/AutoTest/interface/tb_external_transport.h b/src/video_engine/test/auto_test/interface/tb_external_transport.h similarity index 100% rename from src/video_engine/main/test/AutoTest/interface/tb_external_transport.h rename to src/video_engine/test/auto_test/interface/tb_external_transport.h diff --git a/src/video_engine/main/test/AutoTest/interface/tb_interfaces.h b/src/video_engine/test/auto_test/interface/tb_interfaces.h similarity index 100% rename from src/video_engine/main/test/AutoTest/interface/tb_interfaces.h rename to src/video_engine/test/auto_test/interface/tb_interfaces.h diff --git a/src/video_engine/main/test/AutoTest/interface/tb_video_channel.h b/src/video_engine/test/auto_test/interface/tb_video_channel.h similarity index 100% rename from src/video_engine/main/test/AutoTest/interface/tb_video_channel.h rename to src/video_engine/test/auto_test/interface/tb_video_channel.h diff --git a/src/video_engine/main/test/AutoTest/interface/vie_autotest.h b/src/video_engine/test/auto_test/interface/vie_autotest.h similarity index 100% rename from src/video_engine/main/test/AutoTest/interface/vie_autotest.h rename to src/video_engine/test/auto_test/interface/vie_autotest.h diff --git a/src/video_engine/main/test/AutoTest/interface/vie_autotest_android.h b/src/video_engine/test/auto_test/interface/vie_autotest_android.h similarity index 100% rename from src/video_engine/main/test/AutoTest/interface/vie_autotest_android.h rename to src/video_engine/test/auto_test/interface/vie_autotest_android.h diff --git a/src/video_engine/main/test/AutoTest/interface/vie_autotest_defines.h b/src/video_engine/test/auto_test/interface/vie_autotest_defines.h similarity index 100% rename from src/video_engine/main/test/AutoTest/interface/vie_autotest_defines.h rename to src/video_engine/test/auto_test/interface/vie_autotest_defines.h diff --git a/src/video_engine/main/test/AutoTest/interface/vie_autotest_linux.h b/src/video_engine/test/auto_test/interface/vie_autotest_linux.h similarity index 100% rename from src/video_engine/main/test/AutoTest/interface/vie_autotest_linux.h rename to src/video_engine/test/auto_test/interface/vie_autotest_linux.h diff --git a/src/video_engine/main/test/AutoTest/interface/vie_autotest_mac_carbon.h b/src/video_engine/test/auto_test/interface/vie_autotest_mac_carbon.h similarity index 100% rename from src/video_engine/main/test/AutoTest/interface/vie_autotest_mac_carbon.h rename to src/video_engine/test/auto_test/interface/vie_autotest_mac_carbon.h diff --git a/src/video_engine/main/test/AutoTest/interface/vie_autotest_mac_cocoa.h b/src/video_engine/test/auto_test/interface/vie_autotest_mac_cocoa.h similarity index 100% rename from src/video_engine/main/test/AutoTest/interface/vie_autotest_mac_cocoa.h rename to src/video_engine/test/auto_test/interface/vie_autotest_mac_cocoa.h diff --git a/src/video_engine/main/test/AutoTest/interface/vie_autotest_main.h b/src/video_engine/test/auto_test/interface/vie_autotest_main.h similarity index 100% rename from src/video_engine/main/test/AutoTest/interface/vie_autotest_main.h rename to src/video_engine/test/auto_test/interface/vie_autotest_main.h diff --git a/src/video_engine/main/test/AutoTest/interface/vie_autotest_window_manager_interface.h b/src/video_engine/test/auto_test/interface/vie_autotest_window_manager_interface.h similarity index 100% rename from src/video_engine/main/test/AutoTest/interface/vie_autotest_window_manager_interface.h rename to src/video_engine/test/auto_test/interface/vie_autotest_window_manager_interface.h diff --git a/src/video_engine/main/test/AutoTest/interface/vie_autotest_windows.h b/src/video_engine/test/auto_test/interface/vie_autotest_windows.h similarity index 100% rename from src/video_engine/main/test/AutoTest/interface/vie_autotest_windows.h rename to src/video_engine/test/auto_test/interface/vie_autotest_windows.h diff --git a/src/video_engine/main/test/AutoTest/interface/vie_comparison_tests.h b/src/video_engine/test/auto_test/interface/vie_comparison_tests.h similarity index 100% rename from src/video_engine/main/test/AutoTest/interface/vie_comparison_tests.h rename to src/video_engine/test/auto_test/interface/vie_comparison_tests.h diff --git a/src/video_engine/main/test/AutoTest/interface/vie_window_manager_factory.h b/src/video_engine/test/auto_test/interface/vie_window_manager_factory.h similarity index 100% rename from src/video_engine/main/test/AutoTest/interface/vie_window_manager_factory.h rename to src/video_engine/test/auto_test/interface/vie_window_manager_factory.h diff --git a/src/video_engine/main/test/AutoTest/media/captureDeviceImage.bmp b/src/video_engine/test/auto_test/media/captureDeviceImage.bmp similarity index 100% rename from src/video_engine/main/test/AutoTest/media/captureDeviceImage.bmp rename to src/video_engine/test/auto_test/media/captureDeviceImage.bmp diff --git a/src/video_engine/main/test/AutoTest/media/captureDeviceImage.jpg b/src/video_engine/test/auto_test/media/captureDeviceImage.jpg similarity index 100% rename from src/video_engine/main/test/AutoTest/media/captureDeviceImage.jpg rename to src/video_engine/test/auto_test/media/captureDeviceImage.jpg diff --git a/src/video_engine/main/test/AutoTest/media/renderStartImage.bmp b/src/video_engine/test/auto_test/media/renderStartImage.bmp similarity index 100% rename from src/video_engine/main/test/AutoTest/media/renderStartImage.bmp rename to src/video_engine/test/auto_test/media/renderStartImage.bmp diff --git a/src/video_engine/main/test/AutoTest/media/renderStartImage.jpg b/src/video_engine/test/auto_test/media/renderStartImage.jpg similarity index 100% rename from src/video_engine/main/test/AutoTest/media/renderStartImage.jpg rename to src/video_engine/test/auto_test/media/renderStartImage.jpg diff --git a/src/video_engine/main/test/AutoTest/media/renderTimeoutImage.bmp b/src/video_engine/test/auto_test/media/renderTimeoutImage.bmp similarity index 100% rename from src/video_engine/main/test/AutoTest/media/renderTimeoutImage.bmp rename to src/video_engine/test/auto_test/media/renderTimeoutImage.bmp diff --git a/src/video_engine/main/test/AutoTest/media/renderTimeoutImage.jpg b/src/video_engine/test/auto_test/media/renderTimeoutImage.jpg similarity index 100% rename from src/video_engine/main/test/AutoTest/media/renderTimeoutImage.jpg rename to src/video_engine/test/auto_test/media/renderTimeoutImage.jpg diff --git a/src/video_engine/main/test/AutoTest/primitives/base_primitives.cc b/src/video_engine/test/auto_test/primitives/base_primitives.cc similarity index 100% rename from src/video_engine/main/test/AutoTest/primitives/base_primitives.cc rename to src/video_engine/test/auto_test/primitives/base_primitives.cc diff --git a/src/video_engine/main/test/AutoTest/primitives/base_primitives.h b/src/video_engine/test/auto_test/primitives/base_primitives.h similarity index 100% rename from src/video_engine/main/test/AutoTest/primitives/base_primitives.h rename to src/video_engine/test/auto_test/primitives/base_primitives.h diff --git a/src/video_engine/main/test/AutoTest/primitives/codec_primitives.cc b/src/video_engine/test/auto_test/primitives/codec_primitives.cc similarity index 100% rename from src/video_engine/main/test/AutoTest/primitives/codec_primitives.cc rename to src/video_engine/test/auto_test/primitives/codec_primitives.cc diff --git a/src/video_engine/main/test/AutoTest/primitives/codec_primitives.h b/src/video_engine/test/auto_test/primitives/codec_primitives.h similarity index 100% rename from src/video_engine/main/test/AutoTest/primitives/codec_primitives.h rename to src/video_engine/test/auto_test/primitives/codec_primitives.h diff --git a/src/video_engine/main/test/AutoTest/primitives/general_primitives.cc b/src/video_engine/test/auto_test/primitives/general_primitives.cc similarity index 100% rename from src/video_engine/main/test/AutoTest/primitives/general_primitives.cc rename to src/video_engine/test/auto_test/primitives/general_primitives.cc diff --git a/src/video_engine/main/test/AutoTest/primitives/general_primitives.h b/src/video_engine/test/auto_test/primitives/general_primitives.h similarity index 100% rename from src/video_engine/main/test/AutoTest/primitives/general_primitives.h rename to src/video_engine/test/auto_test/primitives/general_primitives.h diff --git a/src/video_engine/main/test/AutoTest/source/Android.mk b/src/video_engine/test/auto_test/source/Android.mk similarity index 67% rename from src/video_engine/main/test/AutoTest/source/Android.mk rename to src/video_engine/test/auto_test/source/Android.mk index 761a23d7c..00585dbef 100644 --- a/src/video_engine/main/test/AutoTest/source/Android.mk +++ b/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 \ diff --git a/src/video_engine/main/test/AutoTest/source/tb_I420_codec.cc b/src/video_engine/test/auto_test/source/tb_I420_codec.cc similarity index 100% rename from src/video_engine/main/test/AutoTest/source/tb_I420_codec.cc rename to src/video_engine/test/auto_test/source/tb_I420_codec.cc diff --git a/src/video_engine/main/test/AutoTest/source/tb_capture_device.cc b/src/video_engine/test/auto_test/source/tb_capture_device.cc similarity index 100% rename from src/video_engine/main/test/AutoTest/source/tb_capture_device.cc rename to src/video_engine/test/auto_test/source/tb_capture_device.cc diff --git a/src/video_engine/main/test/AutoTest/source/tb_external_transport.cc b/src/video_engine/test/auto_test/source/tb_external_transport.cc similarity index 100% rename from src/video_engine/main/test/AutoTest/source/tb_external_transport.cc rename to src/video_engine/test/auto_test/source/tb_external_transport.cc diff --git a/src/video_engine/main/test/AutoTest/source/tb_interfaces.cc b/src/video_engine/test/auto_test/source/tb_interfaces.cc similarity index 100% rename from src/video_engine/main/test/AutoTest/source/tb_interfaces.cc rename to src/video_engine/test/auto_test/source/tb_interfaces.cc diff --git a/src/video_engine/main/test/AutoTest/source/tb_video_channel.cc b/src/video_engine/test/auto_test/source/tb_video_channel.cc similarity index 100% rename from src/video_engine/main/test/AutoTest/source/tb_video_channel.cc rename to src/video_engine/test/auto_test/source/tb_video_channel.cc diff --git a/src/video_engine/main/test/AutoTest/source/vie_autotest.cc b/src/video_engine/test/auto_test/source/vie_autotest.cc similarity index 100% rename from src/video_engine/main/test/AutoTest/source/vie_autotest.cc rename to src/video_engine/test/auto_test/source/vie_autotest.cc diff --git a/src/video_engine/main/test/AutoTest/source/vie_autotest_android.cc b/src/video_engine/test/auto_test/source/vie_autotest_android.cc similarity index 100% rename from src/video_engine/main/test/AutoTest/source/vie_autotest_android.cc rename to src/video_engine/test/auto_test/source/vie_autotest_android.cc diff --git a/src/video_engine/main/test/AutoTest/source/vie_autotest_base.cc b/src/video_engine/test/auto_test/source/vie_autotest_base.cc similarity index 100% rename from src/video_engine/main/test/AutoTest/source/vie_autotest_base.cc rename to src/video_engine/test/auto_test/source/vie_autotest_base.cc diff --git a/src/video_engine/main/test/AutoTest/source/vie_autotest_capture.cc b/src/video_engine/test/auto_test/source/vie_autotest_capture.cc similarity index 100% rename from src/video_engine/main/test/AutoTest/source/vie_autotest_capture.cc rename to src/video_engine/test/auto_test/source/vie_autotest_capture.cc diff --git a/src/video_engine/main/test/AutoTest/source/vie_autotest_codec.cc b/src/video_engine/test/auto_test/source/vie_autotest_codec.cc similarity index 100% rename from src/video_engine/main/test/AutoTest/source/vie_autotest_codec.cc rename to src/video_engine/test/auto_test/source/vie_autotest_codec.cc diff --git a/src/video_engine/main/test/AutoTest/source/vie_autotest_custom_call.cc b/src/video_engine/test/auto_test/source/vie_autotest_custom_call.cc similarity index 100% rename from src/video_engine/main/test/AutoTest/source/vie_autotest_custom_call.cc rename to src/video_engine/test/auto_test/source/vie_autotest_custom_call.cc diff --git a/src/video_engine/main/test/AutoTest/source/vie_autotest_encryption.cc b/src/video_engine/test/auto_test/source/vie_autotest_encryption.cc similarity index 100% rename from src/video_engine/main/test/AutoTest/source/vie_autotest_encryption.cc rename to src/video_engine/test/auto_test/source/vie_autotest_encryption.cc diff --git a/src/video_engine/main/test/AutoTest/source/vie_autotest_file.cc b/src/video_engine/test/auto_test/source/vie_autotest_file.cc similarity index 100% rename from src/video_engine/main/test/AutoTest/source/vie_autotest_file.cc rename to src/video_engine/test/auto_test/source/vie_autotest_file.cc diff --git a/src/video_engine/main/test/AutoTest/source/vie_autotest_image_process.cc b/src/video_engine/test/auto_test/source/vie_autotest_image_process.cc similarity index 100% rename from src/video_engine/main/test/AutoTest/source/vie_autotest_image_process.cc rename to src/video_engine/test/auto_test/source/vie_autotest_image_process.cc diff --git a/src/video_engine/main/test/AutoTest/source/vie_autotest_linux.cc b/src/video_engine/test/auto_test/source/vie_autotest_linux.cc similarity index 100% rename from src/video_engine/main/test/AutoTest/source/vie_autotest_linux.cc rename to src/video_engine/test/auto_test/source/vie_autotest_linux.cc diff --git a/src/video_engine/main/test/AutoTest/source/vie_autotest_loopback.cc b/src/video_engine/test/auto_test/source/vie_autotest_loopback.cc similarity index 100% rename from src/video_engine/main/test/AutoTest/source/vie_autotest_loopback.cc rename to src/video_engine/test/auto_test/source/vie_autotest_loopback.cc diff --git a/src/video_engine/main/test/AutoTest/source/vie_autotest_mac_carbon.cc b/src/video_engine/test/auto_test/source/vie_autotest_mac_carbon.cc similarity index 100% rename from src/video_engine/main/test/AutoTest/source/vie_autotest_mac_carbon.cc rename to src/video_engine/test/auto_test/source/vie_autotest_mac_carbon.cc diff --git a/src/video_engine/main/test/AutoTest/source/vie_autotest_mac_cocoa.mm b/src/video_engine/test/auto_test/source/vie_autotest_mac_cocoa.mm similarity index 100% rename from src/video_engine/main/test/AutoTest/source/vie_autotest_mac_cocoa.mm rename to src/video_engine/test/auto_test/source/vie_autotest_mac_cocoa.mm diff --git a/src/video_engine/main/test/AutoTest/source/vie_autotest_main.cc b/src/video_engine/test/auto_test/source/vie_autotest_main.cc similarity index 100% rename from src/video_engine/main/test/AutoTest/source/vie_autotest_main.cc rename to src/video_engine/test/auto_test/source/vie_autotest_main.cc diff --git a/src/video_engine/main/test/AutoTest/source/vie_autotest_network.cc b/src/video_engine/test/auto_test/source/vie_autotest_network.cc similarity index 100% rename from src/video_engine/main/test/AutoTest/source/vie_autotest_network.cc rename to src/video_engine/test/auto_test/source/vie_autotest_network.cc diff --git a/src/video_engine/main/test/AutoTest/source/vie_autotest_render.cc b/src/video_engine/test/auto_test/source/vie_autotest_render.cc similarity index 100% rename from src/video_engine/main/test/AutoTest/source/vie_autotest_render.cc rename to src/video_engine/test/auto_test/source/vie_autotest_render.cc diff --git a/src/video_engine/main/test/AutoTest/source/vie_autotest_rtp_rtcp.cc b/src/video_engine/test/auto_test/source/vie_autotest_rtp_rtcp.cc similarity index 100% rename from src/video_engine/main/test/AutoTest/source/vie_autotest_rtp_rtcp.cc rename to src/video_engine/test/auto_test/source/vie_autotest_rtp_rtcp.cc diff --git a/src/video_engine/main/test/AutoTest/source/vie_autotest_simulcast.cc b/src/video_engine/test/auto_test/source/vie_autotest_simulcast.cc similarity index 100% rename from src/video_engine/main/test/AutoTest/source/vie_autotest_simulcast.cc rename to src/video_engine/test/auto_test/source/vie_autotest_simulcast.cc diff --git a/src/video_engine/main/test/AutoTest/source/vie_autotest_windows.cc b/src/video_engine/test/auto_test/source/vie_autotest_windows.cc similarity index 100% rename from src/video_engine/main/test/AutoTest/source/vie_autotest_windows.cc rename to src/video_engine/test/auto_test/source/vie_autotest_windows.cc diff --git a/src/video_engine/main/test/AutoTest/source/vie_comparison_tests.cc b/src/video_engine/test/auto_test/source/vie_comparison_tests.cc similarity index 100% rename from src/video_engine/main/test/AutoTest/source/vie_comparison_tests.cc rename to src/video_engine/test/auto_test/source/vie_comparison_tests.cc diff --git a/src/video_engine/main/test/AutoTest/source/vie_window_manager_factory_linux.cc b/src/video_engine/test/auto_test/source/vie_window_manager_factory_linux.cc similarity index 100% rename from src/video_engine/main/test/AutoTest/source/vie_window_manager_factory_linux.cc rename to src/video_engine/test/auto_test/source/vie_window_manager_factory_linux.cc diff --git a/src/video_engine/main/test/AutoTest/source/vie_window_manager_factory_mac.mm b/src/video_engine/test/auto_test/source/vie_window_manager_factory_mac.mm similarity index 100% rename from src/video_engine/main/test/AutoTest/source/vie_window_manager_factory_mac.mm rename to src/video_engine/test/auto_test/source/vie_window_manager_factory_mac.mm diff --git a/src/video_engine/main/test/AutoTest/source/vie_window_manager_factory_win.cc b/src/video_engine/test/auto_test/source/vie_window_manager_factory_win.cc similarity index 100% rename from src/video_engine/main/test/AutoTest/source/vie_window_manager_factory_win.cc rename to src/video_engine/test/auto_test/source/vie_window_manager_factory_win.cc diff --git a/src/video_engine/main/test/AutoTest/vie_auto_test.gypi b/src/video_engine/test/auto_test/vie_auto_test.gypi similarity index 97% rename from src/video_engine/main/test/AutoTest/vie_auto_test.gypi rename to src/video_engine/test/auto_test/vie_auto_test.gypi index 30850bb9a..d738375c2 100644 --- a/src/video_engine/main/test/AutoTest/vie_auto_test.gypi +++ b/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', diff --git a/src/video_engine/video_engine.gyp b/src/video_engine/video_engine.gyp index 56d68465f..261292c7c 100644 --- a/src/video_engine/video_engine.gyp +++ b/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', ], }],