components/cronet/tools/package_ios.py - Issue 2807283002: [Cronet] Build static libcronet.a for iOS with complete dependencies.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: components/cronet/tools/package_ios.py

Issue 2807283002: [Cronet] Build static libcronet.a for iOS with complete dependencies. (Closed)

Patch Set: Disable cronet_consumer_static target for fat builds. Created 3 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: components/cronet/tools/package_ios.py

diff --git a/components/cronet/tools/package_ios.py b/components/cronet/tools/package_ios.py

index 956d545b9c900d3751c12ec5cd7ef59bfadf6614..6fd322061c2b157eb807cb5e1a34bdec5fbd669c 100755

--- a/components/cronet/tools/package_ios.py

+++ b/components/cronet/tools/package_ios.py

@@ -117,10 +117,13 @@ def package_ios_framework_using_gn(out_dir='out/Framework', extra_options=''):

# Copy framework.

shutil.copytree(os.path.join(build_dir, 'Cronet.framework'),

- os.path.join(out_dir, target_dir, 'Cronet.framework'))

+ os.path.join(out_dir, 'Dynamic', target_dir, 'Cronet.framework'))

# Copy symbols.

shutil.copytree(os.path.join(build_dir, 'Cronet.dSYM'),

- os.path.join(out_dir, target_dir, 'Cronet.framework.dSYM'))

+ os.path.join(out_dir, 'Dynamic', target_dir, 'Cronet.framework.dSYM'))

+ # Copy static framework.

+ shutil.copytree(os.path.join(build_dir, 'Static', 'Cronet.framework'),

+ os.path.join(out_dir, 'Static', target_dir, 'Cronet.framework'))

# Copy common files from last built package.

package_dir = os.path.join(build_dir, 'cronet')

@@ -131,7 +134,7 @@ def package_ios_framework_using_gn(out_dir='out/Framework', extra_options=''):

shutil.copytree(os.path.join(build_dir,

'Cronet.framework', 'Headers'),

os.path.join(out_dir, 'Headers'))

- print 'Cronet dynamic framework is packaged into %s' % out_dir

+ print 'Cronet framework is packaged into %s' % out_dir

def main():