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

Unified Diff: build/all_android.gyp

Issue 10051021: apk-based test runner work for android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 8 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..dff500993f0f93734291e5bf5ff9276fb4fc8ff1 100644
--- a/build/all_android.gyp
+++ b/build/all_android.gyp
@@ -40,6 +40,21 @@
'../tools/android/fake_dns/fake_dns.gyp:fake_dns',
'../tools/android/forwarder/forwarder.gyp:forwarder',
'../media/media.gyp:media_unittests',
+ '../testing/android/native_test.gyp:native_test_apk'
+ ],
+ 'conditions': [
+ ['"<(gtest_target_type)"=="shared_library"', {
+ 'dependencies': [
+ # The first item is simply the template. We add as a dep
+ # to make sure it builds in ungenerated form. TODO(jrg):
+ # once stable, transition to a test-only (optional)
+ # target.
+ '../testing/android/native_test.gyp:native_test_apk',
Yaron 2012/04/12 01:29:53 Wait, but why is this needed if you've already spe
John Grabowski 2012/04/13 01:11:37 oops... shouldn't be above yet
+ # Unit test bundles packaged as an apk.
+ '../base/base.gyp:base_unittests_apk',
+ '../ipc/ipc.gyp:ipc_tests_apk',
+ ],
+ }]
],
},
{

Powered by Google App Engine
This is Rietveld 408576698