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

Unified Diff: build/all_android.gyp

Issue 9834037: apk-based test runner work. Not enabled yet. This CL is a combination of upstreaming, ndk/ant-ifi… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: one more line tweak Created 8 years, 9 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
Index: build/all_android.gyp
diff --git a/build/all_android.gyp b/build/all_android.gyp
index bcfd4350e18b7668836b6e818b3754c1b7a86c81..3abca0c79f27884acf8b2706b8cab7611921f513 100644
--- a/build/all_android.gyp
+++ b/build/all_android.gyp
@@ -35,12 +35,19 @@
'../ipc/ipc.gyp:ipc_tests',
'../net/net.gyp:net_unittests',
'../third_party/WebKit/Source/WebKit/chromium/All.gyp:*',
- # From here down: not added to run_tests.py yet.
- '../jingle/jingle.gyp:jingle_unittests',
'../tools/android/fake_dns/fake_dns.gyp:fake_dns',
'../tools/android/forwarder/forwarder.gyp:forwarder',
+ # From here down: not added to run_tests.py yet.
+ '../jingle/jingle.gyp:jingle_unittests',
'../media/media.gyp:media_unittests',
],
+ # The Native Test Runner is not on by default.
+ 'conditions': [
+ ['gtest_target_type=="shared_library"', {
+ 'dependencies': [
+ '../base/base.gyp:native_test_apk',
+ ]
+ }]],
},
{
# Experimental / in-progress targets that are expected to fail

Powered by Google App Engine
This is Rietveld 408576698