android build: progress on content and libjingle.

third_party/libjingle/libjingle.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.
 
 {
   'includes': [
     '../../build/win_precompile.gypi',
   ],
   'target_defaults': {
     'defines': [
@@ skipping 62 matching lines @@
           ],
         }],
         ['OS=="linux"', {
           'defines': [
             'LINUX',
           ],
         }],
         ['OS=="mac"', {
           'defines': [
             'OSX',
           ],

[jam, 2012/01/23 05:11:56]

i'm not family with libjingle, so perhaps whoever committed this gyp file should
review this?

[John Grabowski, 2012/01/25 20:29:15]

Removing from CL

         }],
+        ['OS=="android"', {
+          'defines': [
+            'ANDROID',
+          ],
+        }],
         ['os_posix == 1', {
           'defines': [
             'POSIX',
           ],
         }],
         ['os_bsd==1', {
           'defines': [
             'BSD',
           ],
         }],
@@ skipping 228 matching lines @@
         'source/talk/xmpp/xmppengineimpl.cc',
         'source/talk/xmpp/xmppengineimpl.h',
         'source/talk/xmpp/xmppengineimpl_iq.cc',
         'source/talk/xmpp/xmpplogintask.cc',
         'source/talk/xmpp/xmpplogintask.h',
         'source/talk/xmpp/xmppstanzaparser.cc',
         'source/talk/xmpp/xmppstanzaparser.h',
         'source/talk/xmpp/xmpptask.cc',
         'source/talk/xmpp/xmpptask.h',
       ],
+      'dependencies': [
+        '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
+      ],
+      'export_dependent_settings': [
+        '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
+      ],
       'conditions': [
         ['OS=="win"', {
           'sources': [
             'overrides/talk/base/win32socketinit.cc',
             'source/talk/base/schanneladapter.cc',
             'source/talk/base/schanneladapter.h',
             'source/talk/base/win32.h',
             'source/talk/base/win32.cc',
             'source/talk/base/win32filesystem.cc',
             'source/talk/base/win32filesystem.h',
@@ skipping 23 matching lines @@
           ],
         }],
         ['OS=="mac"', {
           'sources': [
             'source/talk/base/macconversion.cc',
             'source/talk/base/macconversion.h',
             'source/talk/base/macutils.cc',
             'source/talk/base/macutils.h',
           ],
         }],
-      ],
-      'dependencies': [
-        '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
-      ],
-      'export_dependent_settings': [
-        '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
+        ['OS=="android"', {
+          'sources!': [
+            # These depend on jsoncpp which we don't load because we probably
+            # don't actually need this code at all.
+            'source/talk/base/json.cc',
+            'source/talk/base/json.h',
+          ],
+          'dependencies!': [
+            '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
+          ],
+        }],
       ],
     },  # target libjingle
     # This has to be is a separate project due to a bug in MSVS:
     # https://connect.microsoft.com/VisualStudio/feedback/details/368272/duplicate-cpp-filename-in-c-project-visual-studio-2008
     # We have two files named "constants.cc" and MSVS doesn't handle this
     # properly.
     {
       'target_name': 'libjingle_p2p',
       'type': 'static_library',
       'sources': [
@@ skipping 134 matching lines @@
         'source/talk/session/phone/webrtcvideocapturer.h',
         'source/talk/session/phone/webrtcvideoengine.cc',
         'source/talk/session/phone/webrtcvideoengine.h',
         'source/talk/session/phone/webrtcvideoframe.cc',
         'source/talk/session/phone/webrtcvideoframe.h',
         'source/talk/session/phone/webrtcvie.h',
         'source/talk/session/phone/webrtcvoe.h',
         'source/talk/session/phone/webrtcvoiceengine.cc',
         'source/talk/session/phone/webrtcvoiceengine.h',
       ],
-      'dependencies': [
-        '<(DEPTH)/third_party/webrtc/modules/modules.gyp:video_capture_module',
-        '<(DEPTH)/third_party/webrtc/modules/modules.gyp:video_render_module',
-        '<(DEPTH)/third_party/webrtc/video_engine/video_engine.gyp:video_engine_core',
-        '<(DEPTH)/third_party/webrtc/voice_engine/voice_engine.gyp:voice_engine_core',
-        '<(DEPTH)/third_party/webrtc/system_wrappers/source/system_wrappers.gyp:system_wrappers',
-        'libjingle',
+      'conditions': [
+        ['OS!="android"', {
+          'dependencies': [
+            # We won't build with WebRTC on Android.
+            '<(DEPTH)/third_party/webrtc/modules/modules.gyp:video_capture_module',
+            '<(DEPTH)/third_party/webrtc/modules/modules.gyp:video_render_module',
+            '<(DEPTH)/third_party/webrtc/video_engine/video_engine.gyp:video_engine_core',
+            '<(DEPTH)/third_party/webrtc/voice_engine/voice_engine.gyp:voice_engine_core',
+            '<(DEPTH)/third_party/webrtc/system_wrappers/source/system_wrappers.gyp:system_wrappers',
+            'libjingle',
         'libjingle_p2p',
       ],
+        }, {
+          'sources/': [
+            ['exclude', 'source/talk/app/webrtc/'],
+          ],
+        }],
+      ],
     },  # target libjingle_peerconnection
   ],
 }