Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1006)

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

Issue 1934083002: [Cronet] Use gn desc deps to find third_party licenses. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix build from gyp project. Created 4 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/cronet/ios/cronet_environment.cc ('k') | components/cronet/tools/cronet_licenses.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/cronet/tools/cr_cronet.py
diff --git a/components/cronet/tools/cr_cronet.py b/components/cronet/tools/cr_cronet.py
index b13aa28273d1b0de79a0ea0a39483ff45024009f..47401e8b5da5e9759e4f0113a08bb6e416124057 100755
--- a/components/cronet/tools/cr_cronet.py
+++ b/components/cronet/tools/cr_cronet.py
@@ -62,6 +62,8 @@ def main():
'stack',
'debug',
'build-debug'])
+ parser.add_argument('-g', '--gn', action='store_true',
+ help='use gn output directory suffix')
parser.add_argument('-d', '--out_dir', action='store',
help='name of the build directory')
parser.add_argument('-i', '--iphoneos', action='store_true',
@@ -77,24 +79,30 @@ def main():
if is_os:
target_os = 'ios'
test_target = 'cronet_test'
+ gn_args = 'target_cpu = "x64" '
out_dir_suffix = '-iphonesimulator'
if options.iphoneos:
+ gn_args = 'target_cpu = "arm64" '
out_dir_suffix = '-iphoneos'
else:
target_os = 'android'
test_target = 'cronet_test_instrumentation_apk'
+ gn_args = 'use_errorprone_java_compiler=true '
out_dir_suffix = ''
gyp_defines = 'GYP_DEFINES="OS=' + target_os + ' enable_websockets=0 '+ \
'disable_file_support=1 disable_ftp_support=1 '+ \
'enable_errorprone=1 use_platform_icu_alternatives=1 ' + \
'disable_brotli_filter=1"'
- gn_args = 'target_os="' + target_os + '" enable_websockets=false '+ \
+ gn_args += 'target_os="' + target_os + '" enable_websockets=false '+ \
'disable_file_support=true disable_ftp_support=true '+ \
- 'use_errorprone_java_compiler=true use_platform_icu_alternatives=true '+ \
+ 'use_platform_icu_alternatives=true '+ \
'disable_brotli_filter=true'
extra_options = ' '.join(extra_options_list)
+ if options.gn:
+ out_dir_suffix += "-gn"
+
if options.release:
out_dir = 'out/Release' + out_dir_suffix
release_arg = ' --release'
« no previous file with comments | « components/cronet/ios/cronet_environment.cc ('k') | components/cronet/tools/cronet_licenses.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698