Roll chromium_revision 7de03ed..4bc4277 (364770:364953)

talk/libjingle.gyp

 #
 # libjingle
 # Copyright 2012 Google Inc.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
 #
 #  1. Redistributions of source code must retain the above copyright notice,
 #     this list of conditions and the following disclaimer.
 #  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 521 matching lines @@
         'media/webrtc/webrtcvoiceengine.h',
       ],
       'conditions': [
         ['build_libyuv==1', {
           'dependencies': ['<(DEPTH)/third_party/libyuv/libyuv.gyp:libyuv',],
         }],
         ['build_usrsctp==1', {
           'include_dirs': [
             # TODO(jiayl): move this into the direct_dependent_settings of
             # usrsctp.gyp.
-            '<(DEPTH)/third_party/usrsctp',
+            '<(DEPTH)/third_party/usrsctp/usrsctplib',
           ],
           'dependencies': [
             '<(DEPTH)/third_party/usrsctp/usrsctp.gyp:usrsctplib',
           ],
         }],
         ['build_with_chromium==1', {
           'dependencies': [
             '<(webrtc_root)/modules/modules.gyp:video_capture',
             '<(webrtc_root)/modules/modules.gyp:video_render',
           ],
@@ skipping 245 matching lines @@
         ['OS=="android" and build_with_chromium==0', {
           'sources': [
             'app/webrtc/androidvideocapturer.h',
             'app/webrtc/androidvideocapturer.cc',
            ],
         }],
       ],
     },  # target libjingle_peerconnection
   ],
 }