Commit 384463e4 authored by Andrew Grieve's avatar Andrew Grieve Committed by Commit Bot

Make Cronet use GN arg for min_sdk_version and bump android32_ndk_api_level

Java code can have per-target lower-than-default min_sdk_versions, but
the same is not true for native code. In order to increase
min_sdk_version for native code, it must be done globally.

Bug: 1116198, 1119402
Change-Id: Id6e55027f57bae26fc13b4338c4b16c462dfacf5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2367649Reviewed-by: default avatarZhongyi Shi <zhongyi@chromium.org>
Reviewed-by: default avatarPeter Wen <wnwen@chromium.org>
Reviewed-by: default avatarDirk Pranke <dpranke@google.com>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#803202}
parent 10c9953e
...@@ -1816,7 +1816,7 @@ def main(argv): ...@@ -1816,7 +1816,7 @@ def main(argv):
'android_app_bundle'): 'android_app_bundle'):
deps_info['device_classpath'] = device_classpath deps_info['device_classpath'] = device_classpath
if options.tested_apk_config: if options.tested_apk_config:
deps_info['java_runtime_classpath_extended'] = (device_classpath_extended) deps_info['device_classpath_extended'] = device_classpath_extended
if options.type in ('android_apk', 'dist_jar'): if options.type in ('android_apk', 'dist_jar'):
all_interface_jars = [] all_interface_jars = []
......
...@@ -1469,7 +1469,7 @@ if (enable_java_templates) { ...@@ -1469,7 +1469,7 @@ if (enable_java_templates) {
"--min-api=$_min_sdk_version", "--min-api=$_min_sdk_version",
] ]
if (defined(invoker.has_apk_under_test) && invoker.has_apk_under_test) { if (defined(invoker.has_apk_under_test) && invoker.has_apk_under_test) {
args += [ "--input-paths=@FileArg($_rebased_build_config:deps_info:java_runtime_classpath_extended)" ] args += [ "--input-paths=@FileArg($_rebased_build_config:deps_info:device_classpath_extended)" ]
} else { } else {
args += [ "--input-paths=@FileArg($_rebased_build_config:deps_info:device_classpath)" ] args += [ "--input-paths=@FileArg($_rebased_build_config:deps_info:device_classpath)" ]
} }
......
...@@ -2917,7 +2917,11 @@ if (enable_java_templates) { ...@@ -2917,7 +2917,11 @@ if (enable_java_templates) {
input_dex_filearg = input_dex_filearg =
"@FileArg(${_rebased_build_config}:final_dex:all_dex_files)" "@FileArg(${_rebased_build_config}:final_dex:all_dex_files)"
if (_enable_main_dex_list) { if (_enable_main_dex_list) {
main_dex_list_input_classes_filearg = "@FileArg(${_rebased_build_config}:deps_info:java_runtime_classpath_extended)" if (defined(invoker.apk_under_test)) {
main_dex_list_input_classes_filearg = "@FileArg(${_rebased_build_config}:deps_info:device_classpath_extended)"
} else {
main_dex_list_input_classes_filearg = "@FileArg(${_rebased_build_config}:deps_info:device_classpath)"
}
} }
} else { } else {
input_classes_filearg = input_classes_filearg =
......
...@@ -2590,6 +2590,7 @@ ...@@ -2590,6 +2590,7 @@
'mixins': ['cronet_common'], 'mixins': ['cronet_common'],
'gn_args': ('use_partition_alloc=false enable_reporting=true ' 'gn_args': ('use_partition_alloc=false enable_reporting=true '
'use_hashed_jni_names=true ' 'use_hashed_jni_names=true '
'default_min_sdk_version=16 '
'clang_use_default_sample_profile=false ' 'clang_use_default_sample_profile=false '
'enable_resource_whitelist_generation=false'), 'enable_resource_whitelist_generation=false'),
}, },
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment