From 5b3b6b17844942c41d629f6cd9b44f1644cc0ea2 Mon Sep 17 00:00:00 2001 From: "kjellander@webrtc.org" Date: Thu, 10 Oct 2013 08:48:16 +0000 Subject: [PATCH] Reorganize GYP targets to make webrtc.gyp more usable. When WebRTC is built as a part of Chromium, some of the stuff in webrtc.gyp will not be found. This CL fixes this. TEST=trybots passing. I also did some manual builds for Android with the android_builder_webrtc target in build/all_android.gyp of a Chromium checkout. BUG=chromium:304143 R=andrew@webrtc.org Review URL: https://webrtc-codereview.appspot.com/2353004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@4949 4adac7df-926f-26a2-2b94-8c16560cd09d --- tools/e2e_quality/audio/perf | 1 - webrtc/test/test.gyp | 44 ++++++++++--------- .../tools}/e2e_quality/audio/README | 2 +- .../e2e_quality/audio/audio_e2e_harness.cc | 0 .../tools}/e2e_quality/audio/daemon.conf | 0 .../tools}/e2e_quality/audio/default.pa | 0 webrtc/tools/e2e_quality/audio/perf | 1 + .../e2e_quality/audio/run_audio_test.py | 0 .../tools}/e2e_quality/e2e_quality.gyp | 2 +- webrtc/webrtc.gyp | 3 +- 10 files changed, 28 insertions(+), 25 deletions(-) delete mode 120000 tools/e2e_quality/audio/perf rename {tools => webrtc/tools}/e2e_quality/audio/README (95%) rename {tools => webrtc/tools}/e2e_quality/audio/audio_e2e_harness.cc (100%) rename {tools => webrtc/tools}/e2e_quality/audio/daemon.conf (100%) rename {tools => webrtc/tools}/e2e_quality/audio/default.pa (100%) create mode 120000 webrtc/tools/e2e_quality/audio/perf rename {tools => webrtc/tools}/e2e_quality/audio/run_audio_test.py (100%) rename {tools => webrtc/tools}/e2e_quality/e2e_quality.gyp (94%) diff --git a/tools/e2e_quality/audio/perf b/tools/e2e_quality/audio/perf deleted file mode 120000 index 5a5ba365cb..0000000000 --- a/tools/e2e_quality/audio/perf +++ /dev/null @@ -1 +0,0 @@ -../../perf \ No newline at end of file diff --git a/webrtc/test/test.gyp b/webrtc/test/test.gyp index 3991106d21..d30119b9a7 100644 --- a/webrtc/test/test.gyp +++ b/webrtc/test/test.gyp @@ -167,28 +167,32 @@ }], ], }, - { - 'target_name': 'buildbot_tests_scripts', - 'type': 'none', - 'copies': [ - { - 'destination': '<(PRODUCT_DIR)', - 'files': [ - 'buildbot_tests.py', - '<(DEPTH)/tools/e2e_quality/audio/run_audio_test.py', - ], - }, - { - 'destination': '<(PRODUCT_DIR)/perf', - 'files': [ - '<(DEPTH)/tools/perf/__init__.py', - '<(DEPTH)/tools/perf/perf_utils.py', - ], - }, - ], - }, # target buildbot_tests_scripts ], 'conditions': [ + ['build_with_chromium==0', { + 'targets': [ + { + 'target_name': 'buildbot_tests_scripts', + 'type': 'none', + 'copies': [ + { + 'destination': '<(PRODUCT_DIR)', + 'files': [ + 'buildbot_tests.py', + '<(webrtc_root)/tools/e2e_quality/audio/run_audio_test.py', + ], + }, + { + 'destination': '<(PRODUCT_DIR)/perf', + 'files': [ + '<(DEPTH)/tools/perf/__init__.py', + '<(DEPTH)/tools/perf/perf_utils.py', + ], + }, + ], + }, # target buildbot_tests_scripts + ], + }], # TODO(henrike): remove build_with_chromium==1 when the bots are using # Chromium's buildbots. ['include_tests==1 and build_with_chromium==1 and OS=="android" and gtest_target_type=="shared_library"', { diff --git a/tools/e2e_quality/audio/README b/webrtc/tools/e2e_quality/audio/README similarity index 95% rename from tools/e2e_quality/audio/README rename to webrtc/tools/e2e_quality/audio/README index 5c8b6f85fd..aa85385585 100644 --- a/tools/e2e_quality/audio/README +++ b/webrtc/tools/e2e_quality/audio/README @@ -22,6 +22,6 @@ regular expression to extract the quality metric. An example command-line, run from trunk/ -tools/e2e_quality/audio/run_audio_test.py \ +webrtc/tools/e2e_quality/audio/run_audio_test.py \ --input=data/voice_engine/audio_short16.pcm --output=e2e_audio_out.pcm \ --codec=L16 --compare="comparison-tool" --regexp="(\d\.\d{3})" diff --git a/tools/e2e_quality/audio/audio_e2e_harness.cc b/webrtc/tools/e2e_quality/audio/audio_e2e_harness.cc similarity index 100% rename from tools/e2e_quality/audio/audio_e2e_harness.cc rename to webrtc/tools/e2e_quality/audio/audio_e2e_harness.cc diff --git a/tools/e2e_quality/audio/daemon.conf b/webrtc/tools/e2e_quality/audio/daemon.conf similarity index 100% rename from tools/e2e_quality/audio/daemon.conf rename to webrtc/tools/e2e_quality/audio/daemon.conf diff --git a/tools/e2e_quality/audio/default.pa b/webrtc/tools/e2e_quality/audio/default.pa similarity index 100% rename from tools/e2e_quality/audio/default.pa rename to webrtc/tools/e2e_quality/audio/default.pa diff --git a/webrtc/tools/e2e_quality/audio/perf b/webrtc/tools/e2e_quality/audio/perf new file mode 120000 index 0000000000..fa37c96882 --- /dev/null +++ b/webrtc/tools/e2e_quality/audio/perf @@ -0,0 +1 @@ +../../../../tools/perf \ No newline at end of file diff --git a/tools/e2e_quality/audio/run_audio_test.py b/webrtc/tools/e2e_quality/audio/run_audio_test.py similarity index 100% rename from tools/e2e_quality/audio/run_audio_test.py rename to webrtc/tools/e2e_quality/audio/run_audio_test.py diff --git a/tools/e2e_quality/e2e_quality.gyp b/webrtc/tools/e2e_quality/e2e_quality.gyp similarity index 94% rename from tools/e2e_quality/e2e_quality.gyp rename to webrtc/tools/e2e_quality/e2e_quality.gyp index b300c71842..6ddc3a8ce7 100644 --- a/tools/e2e_quality/e2e_quality.gyp +++ b/webrtc/tools/e2e_quality/e2e_quality.gyp @@ -7,7 +7,7 @@ # be found in the AUTHORS file in the root of the source tree. { - 'includes': ['../../webrtc/build/common.gypi'], + 'includes': ['../../build/common.gypi'], 'targets': [ { 'target_name': 'audio_e2e_harness', diff --git a/webrtc/webrtc.gyp b/webrtc/webrtc.gyp index 6f7599bf3b..08d99acf77 100644 --- a/webrtc/webrtc.gyp +++ b/webrtc/webrtc.gyp @@ -33,10 +33,9 @@ 'test/metrics.gyp:*', 'test/test.gyp:*', 'tools/tools.gyp:*', - '../tools/e2e_quality/e2e_quality.gyp:*', ], }], - ['OS=="android"', { + ['build_with_chromium==0 and OS=="android"', { 'dependencies': [ '../tools/android/android_tools_precompiled.gyp:*', ],