commit 0e8f053867baae720cbbe1ddf4d63224e6e49687
author Henrik Kjellander <kjellander@webrtc.org> Fri Sep 15 06:57:50 2017
committer Commit Bot <commit-bot@chromium.org> Fri Sep 15 07:20:49 2017
tree 1d6c78e483fa37f77796abe6acfcecfb2d28c756
parent 92ea95e34af5966555903026f45164afbd7e2088

iOS: Fix license path in API framework script

BUG=chromium:611808
NOTRY=True
NOTREECHECKS=True

Change-Id: I4292a3f9e35da7666039402cf10bac1e0fd2a6b4
Reviewed-on: https://webrtc-review.googlesource.com/1565
Commit-Queue: Henrik Kjellander <kjellander@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#19847}

tools_webrtc/ios/build_ios_libs.py

diff --git a/tools_webrtc/ios/build_ios_libs.py b/tools_webrtc/ios/build_ios_libs.py
index d63f5d91..39cc886 100755
--- a/tools_webrtc/ios/build_ios_libs.py
+++ b/tools_webrtc/ios/build_ios_libs.py
@@ -133,7 +133,7 @@
 
   # Strip debug symbols to reduce size.
   if static_only:
-    gn_target_path = os.path.join(output_dir, 'obj', 'webrtc', 'sdk',
+    gn_target_path = os.path.join(output_dir, 'obj', 'sdk',
                                   'lib%s.a' % gn_target_name)
     cmd = ['strip', '-S', gn_target_path, '-o',
            os.path.join(output_dir, 'lib%s.a' % gn_target_name)]

tools_webrtc/libs/generate_licenses.py

diff --git a/tools_webrtc/libs/generate_licenses.py b/tools_webrtc/libs/generate_licenses.py
index b9ca02f..e3b05a8 100755
--- a/tools_webrtc/libs/generate_licenses.py
+++ b/tools_webrtc/libs/generate_licenses.py
@@ -38,7 +38,7 @@
     'opus': ['third_party/opus/src/COPYING'],
     'protobuf': ['third_party/protobuf/LICENSE'],
     'usrsctp': ['third_party/usrsctp/LICENSE'],
-    'webrtc': ['webrtc/LICENSE', 'webrtc/LICENSE_THIRD_PARTY'],
+    'webrtc': ['LICENSE', 'LICENSE_THIRD_PARTY'],
 
     # Compile time dependencies, no license needed:
     'yasm': [],
@@ -46,7 +46,6 @@
 
 SCRIPT_DIR = os.path.dirname(os.path.realpath(sys.argv[0]))
 CHECKOUT_ROOT = os.path.abspath(os.path.join(SCRIPT_DIR, os.pardir, os.pardir))
-WEBRTC_ROOT = os.path.join(CHECKOUT_ROOT, 'webrtc')
 THIRD_PARTY_LIB_REGEX = r'^.*/third_party/([\w+]+).*$'
 
 class LicenseBuilder(object):