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

Unified Diff: Source/heap/blink_heap_tests.gyp

Issue 148453004: Add a blink_heap_unittests_apk so we can run the tests on Android. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: add BlinkHeapUnitTests.isolate Created 6 years, 11 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 | « Source/heap/BlinkHeapUnitTests.isolate ('k') | public/all.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/heap/blink_heap_tests.gyp
diff --git a/Source/heap/blink_heap_tests.gyp b/Source/heap/blink_heap_tests.gyp
index 513d23c467f9e9808ed84e0e67fc3b9f785519e1..8bd2018f4e7e8911bf2de0301ce5cf48b20fb1f8 100644
--- a/Source/heap/blink_heap_tests.gyp
+++ b/Source/heap/blink_heap_tests.gyp
@@ -53,7 +53,14 @@
'<(DEPTH)/base/allocator/allocator.gyp:allocator',
]
}],
- ]
+ ['OS=="android" and gtest_target_type == "shared_library"', {
+ 'type': 'shared_library',
+ 'dependencies': [
+ '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code',
+ '<(DEPTH)/tools/android/forwarder2/forwarder.gyp:forwarder2',
+ ],
+ }],
+ ],
},
{
'target_name': 'blink_heap_run_all_tests',
@@ -71,5 +78,23 @@
'RunAllTests.cpp',
]
},
+ ], # targets
+ 'conditions': [
+ ['OS=="android" and android_webview_build==0 and gtest_target_type == "shared_library"', {
M-A Ruel 2014/01/27 21:27:53 either "foo==bar" or "foo == bar" but not both. I
Dirk Pranke 2014/01/27 22:09:39 Fixed (to the proper, no-spaces, style :)
+ 'targets': [{
+ 'target_name': 'blink_heap_unittests_apk',
+ 'type': 'none',
+ 'dependencies': [
+ '<(DEPTH)/base/base.gyp:base_java',
+ '<(DEPTH)/net/net.gyp:net_java',
+ 'blink_heap_unittests',
+ ],
+ 'variables': {
+ 'test_suite_name': 'blink_heap_unittests',
+ 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)webkit_unit_tests<(SHARED_LIB_SUFFIX)',
+ },
+ 'includes': [ '../../../../build/apk_test.gypi' ],
+ }],
+ }],
],
}
« no previous file with comments | « Source/heap/BlinkHeapUnitTests.isolate ('k') | public/all.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698