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/+/2367649
Reviewed-by: Zhongyi Shi <zhongyi@chromium.org>
Reviewed-by: Peter Wen <wnwen@chromium.org>
Reviewed-by: Dirk Pranke <dpranke@google.com>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#803202}
GitOrigin-RevId: 384463e4b49150229134f4a5a7a5589e2437f53b
This commit is contained in:
Andrew Grieve 2020-08-31 18:49:55 +00:00 коммит произвёл Copybara-Service
Родитель b1d8cdddd3
Коммит c10077be58
3 изменённых файлов: 7 добавлений и 3 удалений

Просмотреть файл

@ -1816,7 +1816,7 @@ def main(argv):
'android_app_bundle'):
deps_info['device_classpath'] = device_classpath
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'):
all_interface_jars = []

Просмотреть файл

@ -1469,7 +1469,7 @@ if (enable_java_templates) {
"--min-api=$_min_sdk_version",
]
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 {
args += [ "--input-paths=@FileArg($_rebased_build_config:deps_info:device_classpath)" ]
}

Просмотреть файл

@ -2917,7 +2917,11 @@ if (enable_java_templates) {
input_dex_filearg =
"@FileArg(${_rebased_build_config}:final_dex:all_dex_files)"
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 {
input_classes_filearg =