Update build_ios_libs.sh script to build new Objective-C API

talk/build/merge_ios_libs

 #!/usr/bin/python
 #
 # libjingle
 # Copyright 2015 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.
@@ skipping 28 matching lines @@
 
   Uses libtool to generate FAT archive files for each generated library.
 
   Args:
     lib_base_dir: directory whose subdirectories are named by architecture and
                   contain the built libraries for that architecture
 
   Returns:
     Exit code of libtool.
   """
-  output_dir_name = 'fat'
+  include_dir_name = 'include'
+  output_dir_name = 'lib'
   archs = [arch for arch in os.listdir(lib_base_dir)
-           if arch[:1] != '.' and arch != output_dir_name]
+           if arch[:1] != '.' and arch != output_dir_name
+           and arch != include_dir_name]
   # For each arch, find (library name, libary path) for arch. We will merge
   # all libraries with the same name.
   libs = {}
   for dirpath, _, filenames in os.walk(lib_base_dir):
     if dirpath.endswith(output_dir_name):
       continue
     for filename in filenames:
       if not filename.endswith('.a'):
         continue
       entry = libs.get(filename, [])
@@ skipping 65 matching lines @@
 def Main():
   parser = optparse.OptionParser()
   _, args = parser.parse_args()
   if len(args) != 1:
     parser.error('Error: Exactly 1 argument required.')
   lib_base_dir = args[0]
   MergeLibs(lib_base_dir)
 
 if __name__ == '__main__':
   sys.exit(Main())