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 +0,0 @@
-../../perf

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"', {

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})"

webrtc/tools/e2e_quality/audio/perf

@@ -0,0 +1 @@
+../../../../tools/perf

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',

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:*',
           ],