android build: progress on content and libjingle.

third_party/libjingle/libjingle.gyp

Index: third_party/libjingle/libjingle.gyp
diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp
index 916ca846f413f00c9277b3230f1d9d7094dfb82c..6089ff54a4b74ffd0205da228d6270f3a05b1163 100644
--- a/third_party/libjingle/libjingle.gyp
+++ b/third_party/libjingle/libjingle.gyp
@@ -82,6 +82,11 @@
             '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',
@@ -330,6 +335,12 @@
         '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': [
@@ -373,12 +384,17 @@
             '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:
@@ -533,15 +549,24 @@
         '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
   ],
 }