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

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
« no previous file with comments | « base/base.gyp ('k') | build/android/buildbot_functions.sh » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/all_android.gyp
diff --git a/build/all_android.gyp b/build/all_android.gyp
index d7c534cbd8d39fc93f5b0527b0c4f62aaba60a3c..759a6c157374932bc6544c7c877be82ee3ab23d6 100644
--- a/build/all_android.gyp
+++ b/build/all_android.gyp
@@ -49,6 +49,20 @@
# gyps to resolve.
'../chrome/chrome_resources.gyp:packed_resources',
],
+ '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',
+ # Unit test bundles packaged as an apk.
+ '../base/base.gyp:base_unittests_apk',
+ '../ipc/ipc.gyp:ipc_tests_apk',
+ ],
+ }]
+ ],
},
{
# Experimental / in-progress targets that are expected to fail
« no previous file with comments | « base/base.gyp ('k') | build/android/buildbot_functions.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698