commit 36dc8f93f377e6326ca3b6295eddc099d1817018
author pliard@chromium.org <pliard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Sat Oct 06 01:20:01 2012 +0900
committer Qijiang Fan <fqj@google.com> Thu Jun 04 13:28:02 2020 +0900
tree 472fdf7f71a77d878c8b1e13d93dd966501e16b5
parent 7bf65a77428f904ae913521a5cb2cc881f9ca127

Don't make base/net/ui depend on their Java counterpart when building for webview.

This is needed to build Android webview.

TBR=brettw,willchan,sky

Review URL: https://chromiumcodereview.appspot.com/11065035

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160390 0039d316-1c4b-4281-b951-d872f2087c98


CrOS-Libchrome-Original-Commit: 2f11e0172cf0eab47f481dce887f8a92e3e40b29

base/base.gyp

diff --git a/base/base.gyp b/base/base.gyp
index 2111d2e..f4695ad 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',
           ],