Chromecast: adjust test generator GYP rules for ATV.

chromecast/chromecast_tests.gypi

 # Copyright (c) 2014 Google Inc. All Rights Reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'chromium_code': 1
   },
   'targets': [
     {
@@ skipping 197 matching lines @@
             'cast_crash_unittests',
           ],
           'variables': {
             'test_suite_name': 'cast_crash_unittests',
           },
           'includes': ['../build/apk_test.gypi'],
         },  # end of target 'cast_crash_unittests_apk'
         {
           'target_name': 'cast_android_tests',
           'type': 'none',
+          'dependencies': ['cast_android_tests_generator'],
+          'conditions': [
+            ['chromecast_branding=="Chrome"', {
+              'dependencies': [
+                'internal/chromecast_internal.gyp:cast_android_tests_internal',
+              ],
+            }],
+          ],
+        },  # end of target 'cast_android_tests',
+        {
+          'target_name': 'cast_android_tests_generator',
+          'type': 'none',
           'variables': {
             'filters': [
               # The following tests all crash on fugu.
               'cc_unittests_apk --gtest_filter=*:-LayerTreeHostTestContinuousDrawWhenCreatingVisibleTiles.RunMultiThread_DelegatingRenderer_ImplSidePaint',
               'gfx_unittests_apk --gtest_filter=*:-FontListTest.Fonts_DeriveWithHeightUpperBound',
               'media_unittests_apk --gtest_filter=*-AudioInputTest.*:AudioAndroidInputTest*',
             ],
           },
           'dependencies': [
             'cast_base_unittests_apk',
             'cast_crash_unittests_apk',
             '../base/base.gyp:base_unittests_apk',
             '../cc/cc_tests.gyp:cc_unittests_apk',
             '../ipc/ipc.gyp:ipc_tests_apk',
             '../media/media.gyp:media_unittests_apk',
             '../media/midi/midi.gyp:midi_unittests_apk',
             '../net/net.gyp:net_unittests_apk',
             # Note(gunsch): crashes 100% on Fugu. b/22489355
             # '../sandbox/sandbox.gyp:sandbox_linux_jni_unittests_apk',
             '../sql/sql.gyp:sql_unittests_apk',
             '../sync/sync.gyp:sync_unit_tests_apk',
             '../ui/events/events.gyp:events_unittests_apk',
             '../ui/gfx/gfx_tests.gyp:gfx_unittests_apk',
           ],
           'includes': ['build/tests/test_list.gypi'],
-          'conditions': [
-            ['chromecast_branding=="Chrome"', {
-              'dependencies': [
-                'internal/chromecast_internal.gyp:cast_android_tests_internal',
-              ],
-            }],
-          ],
-        },
+        },  # end of target 'cast_android_tests_generator'
         {
           'target_name': 'cast_android_test_lists',
           'type': 'none',
           'dependencies': [
             'cast_android_tests',
           ],
           'variables': {
             'test_generator_py': '<(DEPTH)/chromecast/tools/build/generate_test_lists.py',
             'test_inputs_dir': '<(SHARED_INTERMEDIATE_DIR)/chromecast/tests',
           },
@@ skipping 111 matching lines @@
                 '-a', '<(test_additional_options)',
                 'pack_run',
               ],
             }
           ],
         },
       ],  # end of targets
     }],
   ],  # end of conditions
 }