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

Unified Diff: chrome/chrome_tests.gypi

Issue 1285373007: Revert of Convert ChromeSyncShell to use ChromePublic infrastructure (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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: chrome/chrome_tests.gypi
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 836623329b145ae99a0041547a269c9ad6fc1045..51d8b7e339141069ce5fb29dd43c7a22c46fed30 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -3092,6 +3092,31 @@
'includes': [ '../build/uiautomator_test.gypi' ],
},
{
+ # GN: //chrome/android:chrome_sync_shell_test_apk
+ 'target_name': 'chrome_sync_shell_test_apk',
+ 'type': 'none',
+ 'dependencies': [
+ 'chrome_java',
+ 'chrome_sync_shell_apk_java',
+ 'chrome_java_test_support',
+ '../base/base.gyp:base',
+ '../base/base.gyp:base_java_test_support',
+ '../content/content_shell_and_tests.gyp:content_java_test_support',
+ '../sync/sync.gyp:test_support_sync_proto_java',
+ ],
+ 'variables': {
+ 'apk_name': 'ChromeSyncShellTest',
+ 'java_in_dir': 'android/sync_shell/javatests',
+ 'additional_src_dirs': [ 'android/shell/javatests', ],
+ 'is_test_apk': 1,
+ 'test_type': 'instrumentation',
+ },
+ 'includes': [
+ '../build/java_apk.gypi',
+ '../build/android/test_runner.gypi',
+ ],
+ },
+ {
# GN: //chrome/test/android:chrome_java_test_support
'target_name': 'chrome_java_test_support',
'type': 'none',
« no previous file with comments | « chrome/chrome_shell.gypi ('k') | sync/test/android/javatests/src/org/chromium/sync/test/util/MockAccountManager.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698