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

Unified Diff: Source/wtf/wtf_tests.gyp

Issue 186863002: Build blink_platform_unittests and wtf_unittests on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 10 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/wtf/PartitionAllocTest.cpp ('k') | public/all.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/wtf/wtf_tests.gyp
diff --git a/Source/wtf/wtf_tests.gyp b/Source/wtf/wtf_tests.gyp
index 92daeaaf40ed350ae22fb1b75a8fc466c69b2a57..c013797f13616d81ca0a4e16a3fff8501b5b319b 100644
--- a/Source/wtf/wtf_tests.gyp
+++ b/Source/wtf/wtf_tests.gyp
@@ -51,7 +51,14 @@
'<(DEPTH)/base/base.gyp:base',
'<(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',
+ ],
+ }],
]
},
{
@@ -85,4 +92,21 @@
],
},
],
+ 'conditions': [
+ ['OS=="android" and android_webview_build==0 and gtest_target_type=="shared_library"', {
+ 'targets': [{
+ 'target_name': 'wtf_unittests_apk',
+ 'type': 'none',
+ 'dependencies': [
+ '<(DEPTH)/base/base.gyp:base_java',
+ '<(DEPTH)/net/net.gyp:net_java',
+ 'wtf_unittests',
+ ],
+ 'variables': {
+ 'test_suite_name': 'wtf_unittests',
+ },
+ 'includes': [ '../../../../build/apk_test.gypi' ],
+ }],
+ }],
+ ],
}
« no previous file with comments | « Source/wtf/PartitionAllocTest.cpp ('k') | public/all.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698