Remove {base,net}_java dependencies from GYP client targets on Android.

net/net.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'chromium_code': 1,
 
     'linux_link_kerberos%': 0,
     'conditions': [
@@ skipping 802 matching lines @@
         'websockets/websocket_throttle.cc',
         'websockets/websocket_throttle.h',
       ],
       'defines': [
         'NET_IMPLEMENTATION',
       ],
       'export_dependent_settings': [
         '../base/base.gyp:base',
       ],
       'conditions': [
+        ['OS=="android" and _toolset=="target"', {

[Peter Beverloo, 2012/09/06 10:09:09]

The OS==* conditions in this block start around line 1020, it may be better to
keep them grouped together. How about placing this right in front of the
OS==android block around line 1100?

[Philippe, 2012/09/06 15:49:46]

Done.

+          'dependencies': [
+             'net_java',
+          ],
+          'export_dependent_settings': [
+            'net_java',
+          ],
+        }],
         ['chromeos==1', {
           'sources!': [
              'base/network_change_notifier_linux.cc',
              'base/network_change_notifier_linux.h',
              'base/network_change_notifier_netlink_linux.cc',
              'base/network_change_notifier_netlink_linux.h',
              'proxy/proxy_config_service_linux.cc',
              'proxy/proxy_config_service_linux.h',
           ],
         }],
@@ skipping 1238 matching lines @@
           'includes': [ '../build/jni_generator.gypi' ],
         },
         {
           'target_name': 'net_java',
           'type': 'none',
           'variables': {
             'package_name': 'net',
             'java_in_dir': '../net/android/java',
           },
           'dependencies': [
-            '../base/base.gyp:base_java',
+            '../base/base.gyp:base',
           ],
           'export_dependent_settings': [
-            '../base/base.gyp:base_java',
+            '../base/base.gyp:base',
           ],
           'includes': [ '../build/java.gypi' ],
         },
         {
           'target_name': 'net_javatests',
           'type': 'none',
           'variables': {
             'package_name': 'net_javatests',
             'java_in_dir': '../net/android/javatests',
           },
           'dependencies': [
-            '../base/base.gyp:base_java',
+            '../base/base.gyp:base',
             '../base/base.gyp:base_java_test_support',
+            'net_java',
           ],
           'export_dependent_settings': [
-            '../base/base.gyp:base_java',
+            '../base/base.gyp:base',
             '../base/base.gyp:base_java_test_support',
+            'net_java',
           ],
           'includes': [ '../build/java.gypi' ],
         },
       ],
     }],
     # Special target to wrap a gtest_target_type==shared_library
     # net_unittests into an android apk for execution.
     # See base.gyp for TODO(jrg)s about this strategy.
     ['OS == "android" and gtest_target_type == "shared_library"', {
       'targets': [
@@ skipping 68 matching lines @@
                 '--result', '<@(_outputs)',
                 '--isolate', 'net_unittests.isolate',
               ],
             },
           ],
         },
       ],
     }],
   ],
 }