Move src/ -> webrtc/
TBR=niklas.enbom@webrtc.org Review URL: https://webrtc-codereview.appspot.com/915006 git-svn-id: http://webrtc.googlecode.com/svn/trunk@2963 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
andrew@webrtc.org
6
.gitignore
vendored
6
.gitignore
vendored
@@ -39,9 +39,6 @@
|
|||||||
/Makefile
|
/Makefile
|
||||||
/out
|
/out
|
||||||
/resources
|
/resources
|
||||||
/src/supplement.gypi
|
|
||||||
/src/video_engine/main/test/android_test/bin
|
|
||||||
/src/video_engine/main/test/android_test/gen
|
|
||||||
/testing
|
/testing
|
||||||
/third_party/asan
|
/third_party/asan
|
||||||
/third_party/cygwin
|
/third_party/cygwin
|
||||||
@@ -67,5 +64,8 @@
|
|||||||
/tools/python
|
/tools/python
|
||||||
/tools/valgrind
|
/tools/valgrind
|
||||||
/tools/win
|
/tools/win
|
||||||
|
/webrtc/supplement.gypi
|
||||||
|
/webrtc/video_engine/main/test/android_test/bin
|
||||||
|
/webrtc/video_engine/main/test/android_test/gen
|
||||||
/x86-generic_out/
|
/x86-generic_out/
|
||||||
/xcodebuild
|
/xcodebuild
|
||||||
|
|||||||
4
DEPS
4
DEPS
@@ -104,11 +104,11 @@ deps_os = {
|
|||||||
|
|
||||||
hooks = [
|
hooks = [
|
||||||
{
|
{
|
||||||
# Create a supplement.gypi file under trunk/src. This file will be picked
|
# Create a supplement.gypi file under trunk/webrtc. This file will be picked
|
||||||
# up by gyp and used to enable the standalone build.
|
# up by gyp and used to enable the standalone build.
|
||||||
"pattern": ".",
|
"pattern": ".",
|
||||||
"action": ["python", Var("root_dir") + "/tools/create_supplement_gypi.py",
|
"action": ["python", Var("root_dir") + "/tools/create_supplement_gypi.py",
|
||||||
Var("root_dir") + "/src/supplement.gypi"],
|
Var("root_dir") + "/webrtc/supplement.gypi"],
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
# Pull clang on mac. If nothing changed, or on non-mac platforms, this takes
|
# Pull clang on mac. If nothing changed, or on non-mac platforms, this takes
|
||||||
|
|||||||
@@ -15,10 +15,10 @@
|
|||||||
#include "gflags/gflags.h"
|
#include "gflags/gflags.h"
|
||||||
#include "gtest/gtest.h"
|
#include "gtest/gtest.h"
|
||||||
|
|
||||||
#include "src/voice_engine/include/voe_audio_processing.h"
|
#include "voice_engine/include/voe_audio_processing.h"
|
||||||
#include "src/voice_engine/include/voe_base.h"
|
#include "voice_engine/include/voe_base.h"
|
||||||
#include "src/voice_engine/include/voe_codec.h"
|
#include "voice_engine/include/voe_codec.h"
|
||||||
#include "src/voice_engine/include/voe_hardware.h"
|
#include "voice_engine/include/voe_hardware.h"
|
||||||
|
|
||||||
DEFINE_string(render, "render", "render device name");
|
DEFINE_string(render, "render", "render device name");
|
||||||
DEFINE_string(codec, "ISAC", "codec name");
|
DEFINE_string(codec, "ISAC", "codec name");
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
# be found in the AUTHORS file in the root of the source tree.
|
# be found in the AUTHORS file in the root of the source tree.
|
||||||
|
|
||||||
{
|
{
|
||||||
'includes': [ '../../src/build/common.gypi'],
|
'includes': ['../../webrtc/build/common.gypi'],
|
||||||
'targets': [
|
'targets': [
|
||||||
{
|
{
|
||||||
'target_name': 'audio_e2e_harness',
|
'target_name': 'audio_e2e_harness',
|
||||||
|
|||||||
20
webrtc.gyp
20
webrtc.gyp
@@ -7,15 +7,15 @@
|
|||||||
# be found in the AUTHORS file in the root of the source tree.
|
# be found in the AUTHORS file in the root of the source tree.
|
||||||
|
|
||||||
{
|
{
|
||||||
'includes': [ 'src/build/common.gypi', ],
|
'includes': ['webrtc/build/common.gypi',],
|
||||||
'variables': {
|
'variables': {
|
||||||
'webrtc_all_dependencies': [
|
'webrtc_all_dependencies': [
|
||||||
'src/common_audio/common_audio.gyp:*',
|
'webrtc/common_audio/common_audio.gyp:*',
|
||||||
'src/common_video/common_video.gyp:*',
|
'webrtc/common_video/common_video.gyp:*',
|
||||||
'src/modules/modules.gyp:*',
|
'webrtc/modules/modules.gyp:*',
|
||||||
'src/system_wrappers/source/system_wrappers.gyp:*',
|
'webrtc/system_wrappers/source/system_wrappers.gyp:*',
|
||||||
'src/video_engine/video_engine.gyp:*',
|
'webrtc/video_engine/video_engine.gyp:*',
|
||||||
'src/voice_engine/voice_engine.gyp:*',
|
'webrtc/voice_engine/voice_engine.gyp:*',
|
||||||
'<(webrtc_vp8_dir)/vp8.gyp:*',
|
'<(webrtc_vp8_dir)/vp8.gyp:*',
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
@@ -29,9 +29,9 @@
|
|||||||
'conditions': [
|
'conditions': [
|
||||||
['include_tests==1', {
|
['include_tests==1', {
|
||||||
'dependencies': [
|
'dependencies': [
|
||||||
'src/test/metrics.gyp:*',
|
'webrtc/test/metrics.gyp:*',
|
||||||
'src/test/test.gyp:*',
|
'webrtc/test/test.gyp:*',
|
||||||
'src/tools/tools.gyp:*',
|
'webrtc/tools/tools.gyp:*',
|
||||||
'tools/e2e_quality/e2e_quality.gyp:*',
|
'tools/e2e_quality/e2e_quality.gyp:*',
|
||||||
],
|
],
|
||||||
}],
|
}],
|
||||||
|
|||||||
@@ -24,7 +24,7 @@
|
|||||||
['build_with_chromium==1', {
|
['build_with_chromium==1', {
|
||||||
'webrtc_root%': '<(DEPTH)/third_party/webrtc',
|
'webrtc_root%': '<(DEPTH)/third_party/webrtc',
|
||||||
}, {
|
}, {
|
||||||
'webrtc_root%': '<(DEPTH)/src',
|
'webrtc_root%': '<(DEPTH)/webrtc',
|
||||||
}],
|
}],
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user