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

Unified Diff: build/all_android.gyp

Issue 9852004: Revert 128679 - Speculative revert. xcodebuilders hosed between r128678 - 128680 in GYP phse, this … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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
« no previous file with comments | « base/test/android/native_test_launcher.cc ('k') | build/android/envsetup.sh » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/all_android.gyp
===================================================================
--- build/all_android.gyp (revision 128684)
+++ build/all_android.gyp (working copy)
@@ -35,19 +35,12 @@
'../ipc/ipc.gyp:ipc_tests',
'../net/net.gyp:net_unittests',
'../third_party/WebKit/Source/WebKit/chromium/All.gyp:*',
- '../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',
+ '../tools/android/fake_dns/fake_dns.gyp:fake_dns',
+ '../tools/android/forwarder/forwarder.gyp:forwarder',
'../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
« no previous file with comments | « base/test/android/native_test_launcher.cc ('k') | build/android/envsetup.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698