joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge changes I19c2370e,I85f17cfd,I88e73cbd,Ife95ecdf,I83903596, ...

Browse source 
* changes:
  gn2bp: Set out arg for build/util/version.py
  gn2bp: Add required file to tool_files
  gn2bp: format EVAL arg for build/util/version.py
  gn2bp: Update input arg for build/util/version.py
  gn2bp: add android:cronet to the TARGETS
  gn2bp: Add genrule_header for make_dafsa.py
  gn2bp: Update desc.json
This commit is contained in:
Mohannad Farrag 2022-11-09 10:20:13 +00:00 • committed by Gerrit Code Review
commit 9e99270eee
4 changed files with 4552 additions and 500 deletions
Download patch file Download diff file Expand all files Collapse all files

4019
tools/gn2bp/Android.bp.swp
View file

File diff suppressed because it is too large Load diff

22
tools/gn2bp/desc.json
View file

@ -464080,6 +464080,22 @@
"type": "action_foreach",
"visibility": [ "*" ]
},
"//net/base/registry_controlled_domains:registry_controlled_domains(//build/toolchain/linux:clang_x64)": {
"args": [ "--reverse", "{{source}}", "clang_x64/gen/net/base/registry_controlled_domains/{{source_name_part}}-reversed-inc.cc" ],
"deps": [ ],
"metadata": {
},
"output_patterns": [ "//out/test/clang_x64/gen/net/base/registry_controlled_domains/{{source_name_part}}-reversed-inc.cc" ],
"outputs": [ "//out/test/clang_x64/gen/net/base/registry_controlled_domains/effective_tld_names-reversed-inc.cc", "//out/test/clang_x64/gen/net/base/registry_controlled_domains/effective_tld_names_unittest1-reversed-inc.cc", "//out/test/clang_x64/gen/net/base/registry_controlled_domains/effective_tld_names_unittest2-reversed-inc.cc", "//out/test/clang_x64/gen/net/base/registry_controlled_domains/effective_tld_names_unittest3-reversed-inc.cc", "//out/test/clang_x64/gen/net/base/registry_controlled_domains/effective_tld_names_unittest4-reversed-inc.cc", "//out/test/clang_x64/gen/net/base/registry_controlled_domains/effective_tld_names_unittest5-reversed-inc.cc", "//out/test/clang_x64/gen/net/base/registry_controlled_domains/effective_tld_names_unittest6-reversed-inc.cc" ],
"public": "*",
"script": "//net/tools/dafsa/make_dafsa.py",
"sources": [ "//net/base/registry_controlled_domains/effective_tld_names.gperf", "//net/base/registry_controlled_domains/effective_tld_names_unittest1.gperf", "//net/base/registry_controlled_domains/effective_tld_names_unittest2.gperf", "//net/base/registry_controlled_domains/effective_tld_names_unittest3.gperf", "//net/base/registry_controlled_domains/effective_tld_names_unittest4.gperf", "//net/base/registry_controlled_domains/effective_tld_names_unittest5.gperf", "//net/base/registry_controlled_domains/effective_tld_names_unittest6.gperf" ],
"testonly": false,
"toolchain": "//build/toolchain/linux:clang_x64",
"type": "action_foreach",
"visibility": [ "*" ]
},
"//net/base:features_java": {
"deps": [ "//net/base:features_java__assetres", "//net/base:features_java__dex", "//net/base:features_java__process_device", "//net/base:features_java__validate" ],
"metadata": {
@ -467802,7 +467818,7 @@
"check_includes": true,
"configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:export_dynamic", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:debug", "//net:net_internal_config", "//build/config:precompiled_headers", "//build/config/compiler:wexit_time_destructors", "//base/allocator:wrap_malloc_symbols", "//third_party/protobuf:using_proto", "//third_party/protobuf:allow_deprecated_proto_fields", "//third_party/protobuf:protobuf_config", "//base:android_system_libs", "//third_party/abseil-cpp:absl_include_config", "//third_party/boringssl:external_config", "//third_party/zlib:zlib_config", "//build/config/android:jni_include_dir", "//third_party/brotli:includes" ],
"defines": [ "DCHECK_ALWAYS_ON=1", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_GNU_SOURCE", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r23_1", "CR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc", "_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1", "_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1", "_DEBUG", "DYNAMIC_ANNOTATIONS_ENABLED=1", "NET_IMPLEMENTATION", "ENABLE_BUILT_IN_DNS", "GOOGLE_PROTOBUF_NO_RTTI", "GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER", "GOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0", "HAVE_PTHREAD" ],
"deps": [ "//base:base", "//base/third_party/dynamic_annotations:dynamic_annotations", "//net:constants", "//net:isolation_info_proto", "//net:net_export_header", "//net:net_jni_headers", "//net:preload_decoder", "//third_party/brotli:dec", "//third_party/protobuf:protobuf_lite", "//third_party/zlib:zlib", "//url:buildflags" ],
"deps": [ "//base:base", "//base/third_party/dynamic_annotations:dynamic_annotations", "//net:constants", "//net:isolation_info_proto", "//net:net_export_header", "//net:net_jni_headers", "//net:preload_decoder", "//net/base/registry_controlled_domains:registry_controlled_domains", "//third_party/brotli:dec", "//third_party/protobuf:protobuf_lite", "//third_party/zlib:zlib", "//url:buildflags" ],
"externs": {
},
@ -467834,7 +467850,7 @@
"check_includes": true,
"configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:export_dynamic", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/android:default_orderfile_instrumentation", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:debug", "//net:net_internal_config", "//build/config:precompiled_headers", "//build/config/compiler:wexit_time_destructors", "//base/allocator:wrap_malloc_symbols", "//third_party/protobuf:using_proto", "//third_party/protobuf:allow_deprecated_proto_fields", "//third_party/protobuf:protobuf_config", "//base:android_system_libs", "//third_party/abseil-cpp:absl_include_config", "//third_party/boringssl:external_config", "//third_party/zlib:zlib_config", "//build/config/android:jni_include_dir(//build/toolchain/android:android_clang_x64)", "//third_party/ced:ced_config", "//third_party/icu:icu_config", "//third_party/brotli:includes" ],
"defines": [ "DCHECK_ALWAYS_ON=1", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_GNU_SOURCE", "ANDROID", "HAVE_SYS_UIO_H", "ANDROID_NDK_VERSION_ROLL=r23_1", "CR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc", "_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1", "_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1", "_DEBUG", "DYNAMIC_ANNOTATIONS_ENABLED=1", "NET_IMPLEMENTATION", "ENABLE_BUILT_IN_DNS", "GOOGLE_PROTOBUF_NO_RTTI", "GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER", "GOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0", "HAVE_PTHREAD", "U_USING_ICU_NAMESPACE=0", "U_ENABLE_DYLOAD=0", "USE_CHROMIUM_ICU=1", "U_ENABLE_TRACING=1", "U_ENABLE_RESOURCE_TRACING=0", "U_STATIC_IMPLEMENTATION", "ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE" ],
"deps": [ "//base:base(//build/toolchain/android:android_clang_x86)", "//base:i18n(//build/toolchain/android:android_clang_x86)", "//base/third_party/dynamic_annotations:dynamic_annotations(//build/toolchain/android:android_clang_x86)", "//net:constants(//build/toolchain/android:android_clang_x86)", "//net:isolation_info_proto(//build/toolchain/android:android_clang_x86)", "//net:net_export_header(//build/toolchain/android:android_clang_x86)", "//net:net_jni_headers(//build/toolchain/android:android_clang_x86)", "//net:preload_decoder(//build/toolchain/android:android_clang_x86)", "//third_party/brotli:dec(//build/toolchain/android:android_clang_x86)", "//third_party/icu:icu(//build/toolchain/android:android_clang_x86)", "//third_party/protobuf:protobuf_lite(//build/toolchain/android:android_clang_x86)", "//third_party/zlib:zlib(//build/toolchain/android:android_clang_x86)", "//url:buildflags(//build/toolchain/android:android_clang_x86)" ],
"deps": [ "//base:base(//build/toolchain/android:android_clang_x86)", "//base:i18n(//build/toolchain/android:android_clang_x86)", "//base/third_party/dynamic_annotations:dynamic_annotations(//build/toolchain/android:android_clang_x86)", "//net:constants(//build/toolchain/android:android_clang_x86)", "//net:isolation_info_proto(//build/toolchain/android:android_clang_x86)", "//net:net_export_header(//build/toolchain/android:android_clang_x86)", "//net:net_jni_headers(//build/toolchain/android:android_clang_x86)", "//net:preload_decoder(//build/toolchain/android:android_clang_x86)", "//net/base/registry_controlled_domains:registry_controlled_domains(//build/toolchain/android:android_clang_x86)", "//third_party/brotli:dec(//build/toolchain/android:android_clang_x86)", "//third_party/icu:icu(//build/toolchain/android:android_clang_x86)", "//third_party/protobuf:protobuf_lite(//build/toolchain/android:android_clang_x86)", "//third_party/zlib:zlib(//build/toolchain/android:android_clang_x86)", "//url:buildflags(//build/toolchain/android:android_clang_x86)" ],
"externs": {
},
@ -467865,7 +467881,7 @@
"check_includes": true,
"configs": [ "//build/config:feature_flags", "//build/config/compiler:afdo", "//build/config/compiler:afdo_optimize_size", "//build/config/compiler:cet_shadow_stack", "//build/config/compiler:chromium_code", "//build/config/compiler:compiler", "//build/config/compiler:compiler_arm_fpu", "//build/config/compiler:compiler_arm_thumb", "//build/config/compiler:default_include_dirs", "//build/config/compiler:default_init_stack_vars", "//build/config/compiler:default_optimization", "//build/config/compiler:default_stack_frames", "//build/config/compiler:default_symbols", "//build/config/compiler:export_dynamic", "//build/config/compiler:no_exceptions", "//build/config/compiler:no_rtti", "//build/config/compiler:no_unresolved_symbols", "//build/config/compiler:runtime_library", "//build/config/compiler:thin_archive", "//build/config/compiler:thinlto_optimize_default", "//build/config/compiler/pgo:default_pgo_flags", "//build/config/coverage:default_coverage", "//build/config/sanitizers:default_sanitizer_flags", "//build/config/gcc:symbol_visibility_hidden", "//build/config/clang:find_bad_constructs", "//build/config/clang:extra_warnings", "//build/config:debug", "//net:net_internal_config", "//build/config:precompiled_headers", "//build/config/compiler:wexit_time_destructors", "//build/config/linux:libresolv", "//build/linux:gio_config", "//third_party/protobuf:using_proto", "//third_party/protobuf:allow_deprecated_proto_fields", "//third_party/protobuf:protobuf_config", "//third_party/abseil-cpp:absl_include_config", "//third_party/boringssl:external_config", "//third_party/zlib:zlib_config", "//third_party/ced:ced_config", "//third_party/icu:icu_config", "//third_party/brotli:includes" ],
"defines": [ "DCHECK_ALWAYS_ON=1", "USE_UDEV", "USE_AURA=1", "USE_OZONE=1", "__STDC_CONSTANT_MACROS", "__STDC_FORMAT_MACROS", "_FILE_OFFSET_BITS=64", "_LARGEFILE_SOURCE", "_LARGEFILE64_SOURCE", "_GNU_SOURCE", "CR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"", "_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "CR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc", "_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1", "_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1", "CR_SYSROOT_KEY=20220331T153654Z-0", "_DEBUG", "DYNAMIC_ANNOTATIONS_ENABLED=1", "NET_IMPLEMENTATION", "ENABLE_BUILT_IN_DNS", "USE_GIO", "GOOGLE_PROTOBUF_NO_RTTI", "GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER", "GOOGLE_PROTOBUF_INTERNAL_DONATE_STEAL_INLINE=0", "HAVE_PTHREAD", "U_USING_ICU_NAMESPACE=0", "U_ENABLE_DYLOAD=0", "USE_CHROMIUM_ICU=1", "U_ENABLE_TRACING=1", "U_ENABLE_RESOURCE_TRACING=0", "U_STATIC_IMPLEMENTATION", "ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE" ],
"deps": [ "//base:base(//build/toolchain/linux:clang_x64)", "//base:i18n(//build/toolchain/linux:clang_x64)", "//base/third_party/dynamic_annotations:dynamic_annotations(//build/toolchain/linux:clang_x64)", "//net:constants(//build/toolchain/linux:clang_x64)", "//net:isolation_info_proto(//build/toolchain/linux:clang_x64)", "//net:net_export_header(//build/toolchain/linux:clang_x64)", "//net:preload_decoder(//build/toolchain/linux:clang_x64)", "//third_party/brotli:dec(//build/toolchain/linux:clang_x64)", "//third_party/icu:icu(//build/toolchain/linux:clang_x64)", "//third_party/protobuf:protobuf_lite(//build/toolchain/linux:clang_x64)", "//third_party/zlib:zlib(//build/toolchain/linux:clang_x64)", "//url:buildflags(//build/toolchain/linux:clang_x64)" ],
"deps": [ "//base:base(//build/toolchain/linux:clang_x64)", "//base:i18n(//build/toolchain/linux:clang_x64)", "//base/third_party/dynamic_annotations:dynamic_annotations(//build/toolchain/linux:clang_x64)", "//net:constants(//build/toolchain/linux:clang_x64)", "//net:isolation_info_proto(//build/toolchain/linux:clang_x64)", "//net:net_export_header(//build/toolchain/linux:clang_x64)", "//net:preload_decoder(//build/toolchain/linux:clang_x64)", "//net/base/registry_controlled_domains:registry_controlled_domains(//build/toolchain/linux:clang_x64)", "//third_party/brotli:dec(//build/toolchain/linux:clang_x64)", "//third_party/icu:icu(//build/toolchain/linux:clang_x64)", "//third_party/protobuf:protobuf_lite(//build/toolchain/linux:clang_x64)", "//third_party/zlib:zlib(//build/toolchain/linux:clang_x64)", "//url:buildflags(//build/toolchain/linux:clang_x64)" ],
"externs": {
},

17
tools/gn2bp/gen_android_bp
View file

@ -899,6 +899,23 @@ def create_action_module(blueprint, target):
filename = re.sub('^\.\./\.\./', '', target.args[i + 1])
# This is an output file so use $(location %s)
target.args[i + 1] = '$(location %s)' % filename
elif target.script == "//net/tools/dafsa/make_dafsa.py":
# This script generates .cc files but source (registry_controlled_domain.cc) in the target that
# depends on this target includes .cc file this script generates.
module.genrule_headers.add(module.name)
elif target.script == "//build/util/version.py":
# android_chrome_version.py is not specified in anywhere but version.py imports this file
module.tool_files.add('build/util/android_chrome_version.py')
for i, val in enumerate(target.args):
if val.startswith('../../'):
filename = re.sub('^\.\./\.\./', '', val)
target.args[i] = '$(location %s)' % filename
elif val == '-e':
# arg for -e EVAL option should be passed in -e PATCH_HI=int(PATCH)//256 format.
target.args[i + 1] = '%s=\'%s\'' % (target.args[i + 1], target.args[i + 2])
target.args[i + 2] = ''
elif val == '-o':
target.args[i + 1] = '$(out)'
script = gn_utils.label_to_path(target.script)
module.tool_files.add(script)

2
tools/gn2bp/update_results.sh
View file

@ -12,7 +12,7 @@
set -eux
TARGETS=(
"//net:net"
"//components/cronet/android:cronet"
)
BASEDIR=$(dirname "$0")