Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(707)

Unified Diff: libyuv_test.gyp

Issue 2201893007: Roll chromium_revision 0868029..33f8768 (Closed) Base URL: https://chromium.googlesource.com/libyuv/libyuv@master
Patch Set: Updated documentation Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « libyuv.gyp ('k') | setup_links.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: libyuv_test.gyp
diff --git a/libyuv_test.gyp b/libyuv_test.gyp
index 27b330f65df972e773949667a28debe79f667b47..6994b6e6f7e25b88050b8db410dfad2ace1c524d 100644
--- a/libyuv_test.gyp
+++ b/libyuv_test.gyp
@@ -181,40 +181,16 @@
['OS=="android"', {
'targets': [
{
- # 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',
+ 'target_name': 'yuv_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,
+ 'test_suite_name': 'yuv_unittest',
+ 'input_shlib_path': '<(SHARED_LIB_DIR)/(SHARED_LIB_PREFIX)libyuv_unittest<(SHARED_LIB_SUFFIX)',
},
'includes': [
- 'build/android/test_runner.gypi',
- 'build/java_apk.gypi',
- ],
+ 'build/apk_test.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',
],
},
« no previous file with comments | « libyuv.gyp ('k') | setup_links.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698