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

Unified Diff: base/base.gyp

Issue 11065035: Don't make base/net/ui depend on their Java counterpart when building for webview. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add missing ui.gyp Created 8 years, 2 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 | « no previous file | net/net.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/base.gyp
diff --git a/base/base.gyp b/base/base.gyp
index 090481346262bbdcbe8534115f30871184af797e..9f40c14b1cb391fadd116a91ddf978f7760fc6f2 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -122,7 +122,6 @@
}],
],
'dependencies': [
- 'base_java',
'base_jni_headers',
'symbolize',
'../third_party/ashmem/ashmem.gyp:ashmem',
@@ -142,6 +141,11 @@
'sources!': [
'debug/stack_trace_posix.cc',
],
+ }],
+ ['OS == "android" and _toolset == "target" and android_build_type == 0', {
+ 'dependencies': [
+ 'base_java',
+ ],
'export_dependent_settings': [
'base_java',
],
« no previous file with comments | « no previous file | net/net.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698