Roll chromium_revision 1d144ca7f86..2a818f5413 (375480:395512)

libyuv_test.gyp

 # Copyright 2011 The LibYuv Project Authors. All rights reserved.
 #
 # Use of this source code is governed by a BSD-style license
 # that can be found in the LICENSE file in the root of the source
 # tree. An additional intellectual property rights grant can be found
 # in the file PATENTS. All contributing project authors may
 # be found in the AUTHORS file in the root of the source tree.
 
 {
   'variables': {
@@ skipping 173 matching lines @@
           # TODO(kjellander): Figure out what to change in build/apk_test.gypi
           # to it can be used instead of the copied code below. Using it in its
           # current version was not possible, since the target starts with 'lib',
           # which somewhere confuses the variables.
           'target_name': 'libyuv_unittest_apk',
           'type': 'none',
           'variables': {
             # These are used to configure java_apk.gypi included below.
             'test_type': 'gtest',
             'apk_name': 'libyuv_unittest',
+            'test_suite_name': 'libyuv_unittest',
             'intermediate_dir': '<(PRODUCT_DIR)/libyuv_unittest_apk',
+            'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)libyuv_unittest<(SHARED_LIB_SUFFIX)',
             'final_apk_path': '<(intermediate_dir)/libyuv_unittest-debug.apk',
             'java_in_dir': '<(DEPTH)/testing/android/native_test/java',
+            'test_runner_path': '<(DEPTH)/util/android/test_runner.py',
             'native_lib_target': 'libyuv_unittest',
             'gyp_managed_install': 0,
           },
-          'includes': [ 'build/java_apk.gypi' ],
+          'includes': [
+            'build/android/test_runner.gypi',
+            'build/java_apk.gypi',
+           ],
           'dependencies': [
             '<(DEPTH)/base/base.gyp:base_java',
+            # TODO(kjellander): Figure out why base_build_config_gen is needed
+            # here. It really shouldn't since it's a dependency of base_java
+            # above, but there's always 0 tests run if it's missing.
+            '<(DEPTH)/base/base.gyp:base_build_config_gen',
             '<(DEPTH)/build/android/pylib/device/commands/commands.gyp:chromium_commands',
             '<(DEPTH)/build/android/pylib/remote/device/dummy/dummy.gyp:remote_device_dummy_apk',
             '<(DEPTH)/testing/android/appurify_support.gyp:appurify_support_java',
             '<(DEPTH)/testing/android/on_device_instrumentation.gyp:reporter_java',
             '<(DEPTH)/tools/android/android_tools.gyp:android_tools',
             'libyuv_unittest',
           ],
         },
       ],
     }],
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: