Add NetworkChangeNotifier for 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 21 matching lines @@
         '../build/temp_gyp/googleurl.gyp:googleurl',
         '../crypto/crypto.gyp:crypto',
         '../sdch/sdch.gyp:sdch',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
         '../third_party/zlib/zlib.gyp:zlib',
         '../v8/tools/gyp/v8.gyp:v8',
         'net_resources',
       ],
       'sources': [
+        'android/network_change_notifier.cc',
+        'android/network_change_notifier.h',
+        'android/network_change_notifier_factory.cc',
+        'android/network_change_notifier_factory.h',
         'android/network_library.cc',
         'android/network_library.h',
         'base/address_family.h',
         'base/address_list.cc',
         'base/address_list.h',
         'base/address_list_net_log_param.cc',
         'base/address_list_net_log_param.h',
         'base/asn1_util.cc',
         'base/asn1_util.h',
         'base/auth.cc',
@@ skipping 921 matching lines @@
             },
           },
         ],
         [ 'OS == "android"', {
             'defines': [
               # Android can shut down our app at any time, so we persist session cookies.
               'ENABLE_PERSISTENT_SESSION_COOKIES'
             ],
             'dependencies': [
               '../build/android/system.gyp:ssl',
+              'net_java',
+              'net_jni_headers',
             ],
-            'sources/': [
+            'sources!': [
               # TODO(jingzhao): The below files are excluded because of the
               # missing JNI, add them back when JNI is ready.
-              ['exclude', '^android/'],
+              'android/network_library.cc',
             ],
           }, {  # else OS! = "android"
             'defines': [
               # These are the features Android doesn't support.
               'ENABLE_MEDIA_CODEC_THEORA',
             ],
           },
         ],
         [ 'OS == "linux"', {
             'dependencies': [
@@ skipping 782 matching lines @@
              '../third_party/zlib/zlib.gyp:zlib',
            ],
            'sources': [
              'curvecp/curvecp_transfer_unittest.cc',
              'curvecp/test_client.cc',
              'curvecp/test_server.cc',
            ],
          },
        ]
      }],
+    ['OS=="android"', {
+      'targets': [
+        {
+          'target_name': 'net_jni_headers',
+          'type': 'none',
+          'variables': {
+            'java_sources': [
+              'android/java/org/chromium/net/NetworkChangeNotifier.java',
+            ],
+            'jni_headers': [
+              '<(SHARED_INTERMEDIATE_DIR)/net/jni/network_change_notifier_jni.h',
+            ],
+          },
+          'includes': [ '../build/jni_generator.gypi' ],
+        },
+        {
+          'target_name': 'net_java',
+          'type': 'none',
+          'variables': {
+            'package_name': 'net',
+            'java_in_dir': '../net/android/java',

[Yaron, 2012/04/17 16:18:04]

The "../net" prefix is needed otherwise the find picks up some files from base.

[Ryan Sleevi, 2012/04/17 17:56:06]

Really?

'java_in_dir': '.' should be relativized to 'src/net', so 'android/java' should
be relativized to 'src/net/android/java' and, by the time passed to find (line
40 build/java.gypi) should be fully expanded...

[Yaron, 2012/04/17 22:47:38]

Yes. If I leave it as "android/java", I see the following in
net/net_java.target.mk:

### Rules for action "ant_net":                                                 
                                                                
quiet_cmd_net_java_ant_net = ACTION Building net java sources. $@               
                                                                
cmd_net_java_ant_net =
LD_LIBRARY_PATH=$(builddir)/lib.host:$(builddir)/lib.target:$$LD_LIBRARY_PATH;
export LD_LIBRARY_PATH; cd net; mkdir -p $(
builddir); ant "-DPRODUCT_DIR=$(builddir)" -buildfile android/java/net.xml      
                                                                
                                                       
$(builddir)/chromium_net.jar: obj := $(abs_obj)                                 
                                                                
$(builddir)/chromium_net.jar: builddir := $(abs_builddir)                       
                                                                
$(builddir)/chromium_net.jar: TOOLSET := $(TOOLSET)                             
                                                                
$(builddir)/chromium_net.jar: net/android/java/net.xml
net/android/java/org/chromium/base/PathUtils.java
net/android/java/org/chromium/base/Calle
dByNative.java net/android/java/org/chromium/base/BuildInfo.java
net/android/java/org/chromium/base/SystemMessageHandler.java net/android/java/or
g/chromium/base/ActivityStatus.java FORCE_DO_CMD                                
                                                                
  $(call do_cmd,net_java_ant_net)                         

[Ryan Sleevi, 2012/04/17 22:54:42]

Maybe I'm blind, but what's not correct there? I don't see any files from base
picked up - just net/android/java/org/chromium/base/[blah].java

[Yaron, 2012/04/17 22:55:59]

net/android/java/org/chromium/base/PathUtils.java should be:
base/android/java/org/chromium/base/PathUtils.java

same as for other base java files

+          },
+          'dependencies': [
+            '../base/base.gyp:base_java',
+          ],
+          'includes': [ '../build/java.gypi' ],
+        },
+      ],
+    }],
     ['OS=="win"', {
       'targets': [
         {
           # TODO(port): dump_cache is still Windows-specific.
           'target_name': 'dump_cache',
           'type': 'executable',
           'dependencies': [
             'net',
             'net_test_support',
             '../base/base.gyp:base',
           ],
           'sources': [
             'tools/dump_cache/cache_dumper.cc',
             'tools/dump_cache/cache_dumper.h',
             'tools/dump_cache/dump_cache.cc',
             'tools/dump_cache/dump_files.cc',
             'tools/dump_cache/upgrade.cc',
             'tools/dump_cache/url_to_filename_encoder.cc',
             'tools/dump_cache/url_to_filename_encoder.h',
             'tools/dump_cache/url_utilities.h',
             'tools/dump_cache/url_utilities.cc',
           ],
         },
       ],
     }],
   ],
 }