| Index: talk/build/merge_ios_libs
|
| diff --git a/talk/build/merge_ios_libs b/talk/build/merge_ios_libs
|
| index ba1b21cdcac2880418899ba1c6c1b538b627ee96..6d2698bc4294ec91555620e4a5c60b27d8895eb3 100755
|
| --- a/talk/build/merge_ios_libs
|
| +++ b/talk/build/merge_ios_libs
|
| @@ -46,9 +46,11 @@ def MergeLibs(lib_base_dir):
|
| 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 = {}
|
|
|