Move build scripts to webrtc/build/ios

webrtc/build/ios/merge_ios_libs.gyp

Index: webrtc/build/ios/merge_ios_libs.gyp
diff --git a/talk/build/merge_ios_libs.gyp b/webrtc/build/ios/merge_ios_libs.gyp
similarity index 93%
rename from talk/build/merge_ios_libs.gyp
rename to webrtc/build/ios/merge_ios_libs.gyp
index 83625ff7dbb89fdf8986fcd84b7e37855df9104a..96f6c9924e72577853e1265b416b15796bd07d54 100644
--- a/talk/build/merge_ios_libs.gyp
+++ b/webrtc/build/ios/merge_ios_libs.gyp
@@ -25,7 +25,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 {
-  'includes': ['common.gypi',],
+  'includes': ['<(webrtc_root)/build/common.gypi',],

[kjellander_webrtc, 2016/03/15 04:03:09]

Don't use a variable here (I didn't even expect that to work).

[hjon_webrtc, 2016/03/15 21:07:48]

Done.

   'conditions': [
     ['OS=="ios" or OS=="mac"', {
       'targets': [
@@ -36,7 +36,7 @@
           'dependencies': [
             '../app/webrtc/legacy_objc_api.gyp:libjingle_peerconnection_objc',

[kjellander_webrtc, 2016/03/15 04:03:09]

This won't work. Please test generating project files with this .gyp file in its
new location.

[hjon_webrtc, 2016/03/15 21:07:48]

Done.

           ],
-          'sources': ['<(webrtc_root)/build/no_op.cc',],
+          'sources': ['no_op.cc',],
         },
         {
           'target_name': 'webrtc_api_objc_no_op',
@@ -45,7 +45,7 @@
           'dependencies': [
             '<(webrtc_root)/api/api.gyp:rtc_api_objc',
           ],
-          'sources': ['<(webrtc_root)/build/no_op.cc',],
+          'sources': ['no_op.cc',],
         },
       ],
     }]