admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iOS: Fix license path in API framework script

Browse Source 
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}
This commit is contained in:
Henrik Kjellander 2017-09-15 08:57:50 +02:00 committed by Commit Bot
parent 92ea95e34a
commit 0e8f053867
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools_webrtc/ios/build_ios_libs.py
View File

@ -133,7 +133,7 @@ def BuildWebRTC(output_dir, target_arch, flavor, gn_target_name,
# Strip debug symbols to reduce size. # Strip debug symbols to reduce size.
if static_only: 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) 'lib%s.a' % gn_target_name)
cmd = ['strip', '-S', gn_target_path, '-o', cmd = ['strip', '-S', gn_target_path, '-o',
os.path.join(output_dir, 'lib%s.a' % gn_target_name)] os.path.join(output_dir, 'lib%s.a' % gn_target_name)]

3
tools_webrtc/libs/generate_licenses.py
View File

@ -38,7 +38,7 @@ LIB_TO_LICENSES_DICT = {
'opus': ['third_party/opus/src/COPYING'], 'opus': ['third_party/opus/src/COPYING'],
'protobuf': ['third_party/protobuf/LICENSE'], 'protobuf': ['third_party/protobuf/LICENSE'],
'usrsctp': ['third_party/usrsctp/LICENSE'], 'usrsctp': ['third_party/usrsctp/LICENSE'],
'webrtc': ['webrtc/LICENSE', 'webrtc/LICENSE_THIRD_PARTY'], 'webrtc': ['LICENSE', 'LICENSE_THIRD_PARTY'],
# Compile time dependencies, no license needed: # Compile time dependencies, no license needed:
'yasm': [], 'yasm': [],
@ -46,7 +46,6 @@ LIB_TO_LICENSES_DICT = {
SCRIPT_DIR = os.path.dirname(os.path.realpath(sys.argv[0])) 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)) 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+]+).*$' THIRD_PARTY_LIB_REGEX = r'^.*/third_party/([\w+]+).*$'
class LicenseBuilder(object): class LicenseBuilder(object):