summaryrefslogtreecommitdiffstats
path: root/sync/sync_tests.gypi
diff options
context:
space:
mode:
authormiguelg <miguelg@chromium.org>2015-01-30 03:20:32 -0800
committerCommit bot <commit-bot@chromium.org>2015-01-30 11:21:19 +0000
commite636eab5a532be27a3953409f3a3534bd976a4da (patch)
treed3076b3d4fea8de06bc504d1b873b1422f1f88f0 /sync/sync_tests.gypi
parent72a49c1e70b07101c1a22161914adc297a4d0e42 (diff)
downloadchromium_src-e636eab5a532be27a3953409f3a3534bd976a4da.zip
chromium_src-e636eab5a532be27a3953409f3a3534bd976a4da.tar.gz
chromium_src-e636eab5a532be27a3953409f3a3534bd976a4da.tar.bz2
Revert of Create a Android Sync integration test for typed URLs (patchset #4 id:140001 of https://codereview.chromium.org/862113005/)
Reason for revert: This is breaking building chrome/android:chrome_sync_shell_test_apk with gn due to a dependency to the autogenerated enum org.chromium.ui.base.PageTransition; I am not sure why no bots failed when landing it (we don't seem to have gn builder upstream for android?) but reverting it locally makes it build again. To repro: Reapply the patch and run gn gen out/Release --args='is_debug=false os="android" cpu_arch="arm" use_goma=true goma_dir="/usr/local/google/clank/goma/goma"' ninja -C out/Release -j 200 chrome/android:chrome_sync_shell_test_apk Original issue's description: > Create a Android Sync integration test for typed URLs > > This CL introduces JNI plumbing for one method of the FakeServer's > verification API. One test (testUploadTypedUrl) has been added to use > the API; it types a URL on the client and verifies that the URL was > sent to the server. > > BUG=NONE > > Committed: https://crrev.com/cba424b9309c8c75d0a3797b9b228f7ef11425e4 > Cr-Commit-Position: refs/heads/master@{#313824} TBR=nyquist@chromium.org,maxbogue@chromium.org,zea@chromium.org,pvalenzuela@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=NONE Review URL: https://codereview.chromium.org/881753003 Cr-Commit-Position: refs/heads/master@{#313898}
Diffstat (limited to 'sync/sync_tests.gypi')
-rw-r--r--sync/sync_tests.gypi1
1 files changed, 0 insertions, 1 deletions
diff --git a/sync/sync_tests.gypi b/sync/sync_tests.gypi
index 1c39e5b..b1ef9cf 100644
--- a/sync/sync_tests.gypi
+++ b/sync/sync_tests.gypi
@@ -475,7 +475,6 @@
'dependencies': [
'sync_fake_server_jni_headers',
'test_support_sync_fake_server',
- '../testing/gtest.gyp:gtest',
'../base/base.gyp:base',
],
'sources': [