From 5446df8d3337e49e54cdecd5cf222b4872264d8d Mon Sep 17 00:00:00 2001 From: Patrick Rohr Date: Fri, 18 Nov 2022 14:54:55 -0800 Subject: [PATCH 1/6] gn2bp: unconditionally remove -DANDROID for all host targets It turns out, -DANDROID was not consistently applied across the chromium code base, so it was removed for some targets where it shouldn't have been. Adding it to the host defaults solves this problem. Test: //components/android/cronet:cronet Change-Id: Ieff81727410c47a0d90d22b56348c6773f653a25 --- tools/gn2bp/Android.bp.swp | 193 ++----------------------------------- tools/gn2bp/gen_android_bp | 14 +-- 2 files changed, 15 insertions(+), 192 deletions(-) diff --git a/tools/gn2bp/Android.bp.swp b/tools/gn2bp/Android.bp.swp index 4687c4ac2d..87f3931df4 100644 --- a/tools/gn2bp/Android.bp.swp +++ b/tools/gn2bp/Android.bp.swp @@ -202,7 +202,6 @@ cc_library_static { "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "-D__STDC_CONSTANT_MACROS", "-D__STDC_FORMAT_MACROS", - "-UANDROID", ], local_include_dirs: [ "./", @@ -258,7 +257,6 @@ cc_library_static { "-D_FILE_OFFSET_BITS=64", "-D_LARGEFILE64_SOURCE", "-D_LARGEFILE_SOURCE", - "-UANDROID", ], }, }, @@ -920,7 +918,6 @@ cc_library_static { "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "-D__STDC_CONSTANT_MACROS", "-D__STDC_FORMAT_MACROS", - "-UANDROID", ], local_include_dirs: [ "./", @@ -1142,7 +1139,6 @@ cc_library_static { "-D_FILE_OFFSET_BITS=64", "-D_LARGEFILE64_SOURCE", "-D_LARGEFILE_SOURCE", - "-UANDROID", ], }, }, @@ -1442,7 +1438,6 @@ cc_library_static { "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "-D__STDC_CONSTANT_MACROS", "-D__STDC_FORMAT_MACROS", - "-UANDROID", ], local_include_dirs: [ "./", @@ -1475,7 +1470,6 @@ cc_library_static { "-D_FILE_OFFSET_BITS=64", "-D_LARGEFILE64_SOURCE", "-D_LARGEFILE_SOURCE", - "-UANDROID", ], }, }, @@ -1789,7 +1783,6 @@ cc_library_static { "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "-D__STDC_CONSTANT_MACROS", "-D__STDC_FORMAT_MACROS", - "-UANDROID", ], local_include_dirs: [ "./", @@ -1822,7 +1815,6 @@ cc_library_static { "-D_FILE_OFFSET_BITS=64", "-D_LARGEFILE64_SOURCE", "-D_LARGEFILE_SOURCE", - "-UANDROID", ], }, }, @@ -1849,7 +1841,6 @@ cc_library_static { "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1", "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", - "-UANDROID", ], local_include_dirs: [ "./", @@ -1882,7 +1873,6 @@ cc_library_static { "-D_FILE_OFFSET_BITS=64", "-D_LARGEFILE64_SOURCE", "-D_LARGEFILE_SOURCE", - "-UANDROID", ], }, }, @@ -1919,7 +1909,6 @@ cc_library_static { "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1", "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", - "-UANDROID", ], local_include_dirs: [ "./", @@ -1928,13 +1917,6 @@ cc_library_static { "buildtools/third_party/libc++abi/trunk/include", ], cpp_std: "c++20", - target: { - host: { - cflags: [ - "-UANDROID", - ], - }, - }, } // GN: //base/third_party/xdg_mime:xdg_mime @@ -1973,7 +1955,6 @@ cc_library_static { "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1", "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", - "-UANDROID", ], local_include_dirs: [ "./", @@ -1982,13 +1963,6 @@ cc_library_static { "buildtools/third_party/libc++abi/trunk/include", ], cpp_std: "c++20", - target: { - host: { - cflags: [ - "-UANDROID", - ], - }, - }, } // GN: //base/third_party/xdg_user_dirs:xdg_user_dirs @@ -2022,7 +1996,6 @@ cc_library_static { "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "-D__STDC_CONSTANT_MACROS", "-D__STDC_FORMAT_MACROS", - "-UANDROID", ], local_include_dirs: [ "./", @@ -2031,13 +2004,6 @@ cc_library_static { "buildtools/third_party/libc++abi/trunk/include", ], cpp_std: "c++20", - target: { - host: { - cflags: [ - "-UANDROID", - ], - }, - }, } // GN: //base:tracing_buildflags @@ -2528,18 +2494,6 @@ cc_library_shared { "-fexceptions", ], rtti: true, - target: { - android_x86: { - cflags: [ - "-UANDROID", - ], - }, - android_x86_64: { - cflags: [ - "-UANDROID", - ], - }, - }, } // GN: //components/cronet/android:cronet_jni_headers @@ -3261,18 +3215,6 @@ cc_library_static { "jni_headers", ], cpp_std: "c++20", - target: { - android_x86: { - cflags: [ - "-UANDROID", - ], - }, - android_x86_64: { - cflags: [ - "-UANDROID", - ], - }, - }, } // GN: //crypto:buildflags @@ -3359,7 +3301,6 @@ cc_library_static { "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "-D__STDC_CONSTANT_MACROS", "-D__STDC_FORMAT_MACROS", - "-UANDROID", ], local_include_dirs: [ "./", @@ -3409,7 +3350,6 @@ cc_library_static { "-D_FILE_OFFSET_BITS=64", "-D_LARGEFILE64_SOURCE", "-D_LARGEFILE_SOURCE", - "-UANDROID", ], local_include_dirs: [ "build/linux/debian_bullseye_amd64-sysroot/usr/include/nspr", @@ -3438,6 +3378,13 @@ cc_defaults { "-fvisibility=hidden", ], stl: "none", + target: { + host: { + cflags: [ + "-UANDROID", + ], + }, + }, } // GN: //ipc:param_traits @@ -4742,17 +4689,11 @@ cc_library_static { srcs: [ "net/disk_cache/blockfile/mapped_file_posix.cc", ], - cflags: [ - "-UANDROID", - ], }, android_x86_64: { srcs: [ "net/disk_cache/blockfile/mapped_file_bypass_mmap_posix.cc", ], - cflags: [ - "-UANDROID", - ], }, }, } @@ -5043,18 +4984,6 @@ cc_library_static { "third_party/boringssl/src/include/", ], cpp_std: "c++20", - target: { - android_x86: { - cflags: [ - "-UANDROID", - ], - }, - android_x86_64: { - cflags: [ - "-UANDROID", - ], - }, - }, } // GN: //net/third_party/quiche:net_quic_proto @@ -5600,18 +5529,6 @@ cc_library_static { "third_party/zlib/", ], cpp_std: "c++20", - target: { - android_x86: { - cflags: [ - "-UANDROID", - ], - }, - android_x86_64: { - cflags: [ - "-UANDROID", - ], - }, - }, } // GN: //net/traffic_annotation:traffic_annotation @@ -5707,18 +5624,6 @@ cc_library_static { "third_party/boringssl/src/include/", ], cpp_std: "c++20", - target: { - android_x86: { - cflags: [ - "-UANDROID", - ], - }, - android_x86_64: { - cflags: [ - "-UANDROID", - ], - }, - }, } // GN: //third_party/abseil-cpp:absl @@ -7568,7 +7473,6 @@ cc_library_static { "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "-D__STDC_CONSTANT_MACROS", "-D__STDC_FORMAT_MACROS", - "-UANDROID", ], local_include_dirs: [ "./", @@ -7602,7 +7506,6 @@ cc_library_static { "-D_FILE_OFFSET_BITS=64", "-D_LARGEFILE64_SOURCE", "-D_LARGEFILE_SOURCE", - "-UANDROID", ], }, }, @@ -7725,18 +7628,6 @@ cc_library_static { "third_party/brotli/include/", ], cpp_std: "c++20", - target: { - android_x86: { - cflags: [ - "-UANDROID", - ], - }, - android_x86_64: { - cflags: [ - "-UANDROID", - ], - }, - }, } // GN: //third_party/brotli:dec @@ -7780,18 +7671,6 @@ cc_library_static { "third_party/brotli/include/", ], cpp_std: "c++20", - target: { - android_x86: { - cflags: [ - "-UANDROID", - ], - }, - android_x86_64: { - cflags: [ - "-UANDROID", - ], - }, - }, } // GN: //third_party/brotli:headers @@ -8074,7 +7953,6 @@ cc_library_static { "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1", "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", - "-UANDROID", ], local_include_dirs: [ "./", @@ -8110,7 +7988,6 @@ cc_library_static { "-D_FILE_OFFSET_BITS=64", "-D_LARGEFILE64_SOURCE", "-D_LARGEFILE_SOURCE", - "-UANDROID", ], }, }, @@ -8351,7 +8228,6 @@ cc_library_static { "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "-D__STDC_CONSTANT_MACROS", "-D__STDC_FORMAT_MACROS", - "-UANDROID", ], local_include_dirs: [ "./", @@ -8387,7 +8263,6 @@ cc_library_static { "-D_FILE_OFFSET_BITS=64", "-D_LARGEFILE64_SOURCE", "-D_LARGEFILE_SOURCE", - "-UANDROID", ], }, }, @@ -8433,7 +8308,6 @@ cc_library_static { "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1", "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", - "-UANDROID", ], local_include_dirs: [ "./", @@ -8472,7 +8346,6 @@ cc_library_static { "-D_FILE_OFFSET_BITS=64", "-D_LARGEFILE64_SOURCE", "-D_LARGEFILE_SOURCE", - "-UANDROID", ], local_include_dirs: [ "third_party/libevent/linux/", @@ -8643,7 +8516,6 @@ cc_library_static { "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "-D__STDC_CONSTANT_MACROS", "-D__STDC_FORMAT_MACROS", - "-UANDROID", ], local_include_dirs: [ "./", @@ -8676,7 +8548,6 @@ cc_library_static { "-D_FILE_OFFSET_BITS=64", "-D_LARGEFILE64_SOURCE", "-D_LARGEFILE_SOURCE", - "-UANDROID", ], }, }, @@ -8802,7 +8673,6 @@ cc_library_static { "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1", "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", - "-UANDROID", ], local_include_dirs: [ "./", @@ -8813,13 +8683,6 @@ cc_library_static { "third_party/zlib/", ], cpp_std: "c++20", - target: { - host: { - cflags: [ - "-UANDROID", - ], - }, - }, } // GN: //third_party/protobuf:protobuf_lite @@ -8892,18 +8755,6 @@ cc_library_static { "third_party/protobuf/src/", ], cpp_std: "c++20", - target: { - android_x86: { - cflags: [ - "-UANDROID", - ], - }, - android_x86_64: { - cflags: [ - "-UANDROID", - ], - }, - }, } // GN: //third_party/protobuf:protoc @@ -8952,7 +8803,6 @@ cc_binary { "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1", "-D_LIBCPP_OVERRIDABLE_FUNC_VIS=__attribute__((__visibility__(\"default\")))", "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", - "-UANDROID", ], local_include_dirs: [ "./", @@ -8967,13 +8817,6 @@ cc_binary { "-fexceptions", ], rtti: true, - target: { - host: { - cflags: [ - "-UANDROID", - ], - }, - }, } // GN: //third_party/protobuf:protoc_lib @@ -9097,7 +8940,6 @@ cc_library_static { "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1", "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", - "-UANDROID", ], local_include_dirs: [ "./", @@ -9107,13 +8949,6 @@ cc_library_static { "third_party/protobuf/src/", ], cpp_std: "c++20", - target: { - host: { - cflags: [ - "-UANDROID", - ], - }, - }, } // GN: //third_party/zlib:zlib @@ -9166,7 +9001,6 @@ cc_library_static { "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", "-D__STDC_CONSTANT_MACROS", "-D__STDC_FORMAT_MACROS", - "-UANDROID", "-mpclmul", "-mssse3", ], @@ -9210,7 +9044,6 @@ cc_library_static { "-D_FILE_OFFSET_BITS=64", "-D_LARGEFILE64_SOURCE", "-D_LARGEFILE_SOURCE", - "-UANDROID", ], }, }, @@ -9409,18 +9242,6 @@ cc_library_static { "jni_headers", ], cpp_std: "c++20", - target: { - android_x86: { - cflags: [ - "-UANDROID", - ], - }, - android_x86_64: { - cflags: [ - "-UANDROID", - ], - }, - }, } // GN: //url:url_jni_headers diff --git a/tools/gn2bp/gen_android_bp b/tools/gn2bp/gen_android_bp index cf8a4fd53c..ac54f6438e 100755 --- a/tools/gn2bp/gen_android_bp +++ b/tools/gn2bp/gen_android_bp @@ -959,12 +959,6 @@ def _get_cflags(cflags, defines): cflags = {flag for flag in cflags if flag in cflag_allowlist} # Consider proper allowlist or denylist if needed cflags |= set("-D%s" % define.replace("\"", "\\\"") for define in defines) - # -DANDROID is added by default but target.defines contain -DANDROID if it's required. - # So adding -UANDROID to cancel default -DANDROID if it's not specified. - # This is needed for some targets(e.g. symbolize) - # TODO: Set -UANDROID considering common define - if "ANDROID" not in defines: - cflags.add("-UANDROID") return cflags def set_module_flags(module, cflags, defines): @@ -1222,6 +1216,14 @@ def create_blueprint_for_targets(gn, targets): '-Wno-unreachable-code-loop-increment', # needed for icui18n '-O2', ] + defaults.target['host'].cflags = [ + # -DANDROID is added by default but target.defines contain -DANDROID if + # it's required. So adding -UANDROID to cancel default -DANDROID if it's + # not specified. + # Note: -DANDROID is not consistently applied across the chromium code + # base, so it is removed unconditionally for host targets. + '-UANDROID', + ] defaults.stl = 'none' blueprint.add_module(defaults) From c03f1bb1d62e0790b858f948d78c19d2141a6c4f Mon Sep 17 00:00:00 2001 From: Patrick Rohr Date: Fri, 18 Nov 2022 16:13:17 -0800 Subject: [PATCH 2/6] gn2bp: add common header dependencies to defaults Chromium builds get these headers directly from sysroot, so they do not explicitly list the dependency. While this is probably an upstream bug (or at least a limitation), it is easiest to just add them to cc_defaults. This also adds jni_headers which are required by multiple targets. Test: //components/cronet/android:cronet Change-Id: Ifb8843aaa60b2454544886b3e60aae42f9a5388e --- tools/gn2bp/Android.bp.swp | 7 ++++++- tools/gn2bp/gen_android_bp | 11 ++++++++--- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/tools/gn2bp/Android.bp.swp b/tools/gn2bp/Android.bp.swp index 87f3931df4..9c2914403a 100644 --- a/tools/gn2bp/Android.bp.swp +++ b/tools/gn2bp/Android.bp.swp @@ -931,7 +931,6 @@ cc_library_static { ], header_libs: [ "jni_headers", - "media_ndk_headers", ], cpp_std: "c++20", target: { @@ -3379,6 +3378,12 @@ cc_defaults { ], stl: "none", target: { + android: { + header_libs: [ + "jni_headers", + "media_ndk_headers", + ], + }, host: { cflags: [ "-UANDROID", diff --git a/tools/gn2bp/gen_android_bp b/tools/gn2bp/gen_android_bp index ac54f6438e..d2c824da87 100755 --- a/tools/gn2bp/gen_android_bp +++ b/tools/gn2bp/gen_android_bp @@ -131,9 +131,6 @@ additional_args = { # that doesn't depend on rtti. undefined symbol: typeinfo 'class' errors appears. ('rtti', True), # go/undefined-symbol-typeinfo ], - 'cronet_aml_base_base': [ - ('header_libs', {"media_ndk_headers"}), - ], } # Android equivalents for third-party libraries that the upstream project @@ -206,6 +203,7 @@ class Target(object): self.shared_libs = set() self.static_libs = set() self.whole_static_libs = set() + self.header_libs = set() self.cflags = set() self.dist = dict() self.strip = dict() @@ -220,6 +218,7 @@ class Target(object): self._output_field(nested_out, 'shared_libs') self._output_field(nested_out, 'static_libs') self._output_field(nested_out, 'whole_static_libs') + self._output_field(nested_out, 'header_libs') self._output_field(nested_out, 'cflags') self._output_field(nested_out, 'stl') self._output_field(nested_out, 'dist') @@ -1216,6 +1215,12 @@ def create_blueprint_for_targets(gn, targets): '-Wno-unreachable-code-loop-increment', # needed for icui18n '-O2', ] + # Chromium builds do not add a dependency for headers found inside the + # sysroot, so they are added globally via defaults. + defaults.target['android'].header_libs = [ + 'media_ndk_headers', + 'jni_headers', + ] defaults.target['host'].cflags = [ # -DANDROID is added by default but target.defines contain -DANDROID if # it's required. So adding -UANDROID to cancel default -DANDROID if it's From 59e45bb3bf300f4fc8b5e157b0ba0ab433098a1d Mon Sep 17 00:00:00 2001 From: Patrick Rohr Date: Fri, 18 Nov 2022 17:30:46 -0800 Subject: [PATCH 3/6] gn2bp: remove jni_headers from jni_generator genrule jni_headers are now globally included in defaults. Test: //components/cronet/android:cronet Change-Id: Ib1ee183eb556c8144713f7df26270b2df6ee12f9 --- tools/gn2bp/Android.bp.swp | 15 --------------- tools/gn2bp/gen_android_bp | 3 --- 2 files changed, 18 deletions(-) diff --git a/tools/gn2bp/Android.bp.swp b/tools/gn2bp/Android.bp.swp index 9c2914403a..79e6ba77f9 100644 --- a/tools/gn2bp/Android.bp.swp +++ b/tools/gn2bp/Android.bp.swp @@ -929,9 +929,6 @@ cc_library_static { "third_party/icu/source/common/", "third_party/icu/source/i18n/", ], - header_libs: [ - "jni_headers", - ], cpp_std: "c++20", target: { android: { @@ -2482,9 +2479,6 @@ cc_library_shared { "third_party/protobuf/src/", "third_party/zlib/", ], - header_libs: [ - "jni_headers", - ], cpp_std: "c++20", linker_scripts: [ "base/android/library_loader/anchor_functions.lds", @@ -3210,9 +3204,6 @@ cc_library_static { "third_party/abseil-cpp/", "third_party/boringssl/src/include/", ], - header_libs: [ - "jni_headers", - ], cpp_std: "c++20", } @@ -4684,9 +4675,6 @@ cc_library_static { "third_party/protobuf/src/", "third_party/zlib/", ], - header_libs: [ - "jni_headers", - ], cpp_std: "c++20", rtti: true, target: { @@ -9243,9 +9231,6 @@ cc_library_static { "third_party/abseil-cpp/", "third_party/boringssl/src/include/", ], - header_libs: [ - "jni_headers", - ], cpp_std: "c++20", } diff --git a/tools/gn2bp/gen_android_bp b/tools/gn2bp/gen_android_bp index d2c824da87..f74077175d 100755 --- a/tools/gn2bp/gen_android_bp +++ b/tools/gn2bp/gen_android_bp @@ -707,9 +707,6 @@ def create_action_module(blueprint, target): target.args[0] = '$(out)' elif target.script == '//base/android/jni_generator/jni_generator.py': - # chromium builds against a prebuilt ndk that contains the jni_headers, so - # a dependency is never explicitly created. - module.genrule_header_libs.add('jni_headers') needs_javap = False for i, val in enumerate(target.args): if val == '--output_dir': From 3cd5ffb2888b4fd158b3e9b6c668a50aedca86f7 Mon Sep 17 00:00:00 2001 From: Patrick Rohr Date: Fri, 18 Nov 2022 17:40:55 -0800 Subject: [PATCH 4/6] gn2bp: get rid of local_include_dir hacks Those should not be needed anymore, as we are using glibc and bionic headers, not the chromium packaged sysroot. Test: //components/cronet/android:cronet Change-Id: I4fe381a2aa1bb35857e70f90b283895dc7f570e2 --- tools/gn2bp/gen_android_bp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/tools/gn2bp/gen_android_bp b/tools/gn2bp/gen_android_bp index f74077175d..3d3953bb44 100755 --- a/tools/gn2bp/gen_android_bp +++ b/tools/gn2bp/gen_android_bp @@ -209,7 +209,7 @@ class Target(object): self.strip = dict() self.stl = None self.cppflags = set() - self.local_include_dirs = [] + self.local_include_dirs = set() self.export_system_include_dirs = set() def to_string(self, output): @@ -265,7 +265,7 @@ class Module(object): self.defaults = set() self.cflags = set() self.include_dirs = set() - self.local_include_dirs = [] + self.local_include_dirs = set() self.header_libs = set() self.required = set() self.tool_files = set() @@ -327,7 +327,7 @@ class Module(object): self._output_field(output, 'defaults') self._output_field(output, 'cflags') self._output_field(output, 'include_dirs') - self._output_field(output, 'local_include_dirs', sort=False) + self._output_field(output, 'local_include_dirs') self._output_field(output, 'header_libs') self._output_field(output, 'required') self._output_field(output, 'dist') @@ -969,20 +969,18 @@ def set_module_flags(module, cflags, defines): module.cppflags.add('-fexceptions') def set_module_include_dirs(module, cflags, include_dirs): - local_include_dirs_set = set() for flag in cflags: if '-isystem' in flag: - local_include_dirs_set.add(flag[len('-isystem../../'):]) + module.local_include_dirs.add(flag[len('-isystem../../'):]) # Adding local_include_dirs is necessary due to source_sets / filegroups # which do not properly propagate include directories. # Filter any directory inside //out as a) this directory does not exist for # aosp / soong builds and b) the include directory should already be # configured via library dependency. - local_include_dirs_set.update([gn_utils.label_to_path(d) + module.local_include_dirs.update([gn_utils.label_to_path(d) for d in include_dirs if not re.match('^//out/.*', d)]) - module.local_include_dirs = sorted(list(local_include_dirs_set)) def create_modules_from_target(blueprint, gn, gn_target_name): From 6ef2272eddf63e49ad5ffb0e0f9ce9f6b3310628 Mon Sep 17 00:00:00 2001 From: Patrick Rohr Date: Fri, 18 Nov 2022 18:24:01 -0800 Subject: [PATCH 5/6] gn2bp: support multiple jni registration modules My next change will start appending ARCH to module names, so this function needs to support multiple jni registration modules. Test: //components/cronet/android:cronet Change-Id: I7788a6bbd8807e527f2e1c6981b5f6219eea9a45 --- tools/gn2bp/gen_android_bp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/tools/gn2bp/gen_android_bp b/tools/gn2bp/gen_android_bp index 3d3953bb44..e919406b07 100755 --- a/tools/gn2bp/gen_android_bp +++ b/tools/gn2bp/gen_android_bp @@ -1163,13 +1163,7 @@ def create_java_module(blueprint, gn): module.srcs.update([gn_utils.label_to_path(source) for source in gn.java_sources]) blueprint.add_module(module) -def update_jni_registration_module(blueprint, gn): - bp_module_name = label_to_module_name('//components/cronet/android:cronet_jni_registration') - if bp_module_name not in blueprint.modules: - # To support building targets that might not create the cronet_jni_registration. - return - module = blueprint.modules[bp_module_name] - +def update_jni_registration_module(module, gn): # TODO: deny list is in the arg of jni_registration_generator.py. Should not be hardcoded deny_list = [ '//base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java', @@ -1231,7 +1225,9 @@ def create_blueprint_for_targets(gn, targets): create_modules_from_target(blueprint, gn, target) create_java_module(blueprint, gn) - update_jni_registration_module(blueprint, gn) + for module in blueprint.modules.values(): + if 'cronet_jni_registration' in module.name: + update_jni_registration_module(module, gn) # Merge in additional hardcoded arguments. for module in blueprint.modules.values(): From 98600687ec91ec8e113b4ead391628be9029bcaf Mon Sep 17 00:00:00 2001 From: Patrick Rohr Date: Fri, 18 Nov 2022 18:29:15 -0800 Subject: [PATCH 6/6] gn2bp: create one action per arch Action modules can have different args depending on target_cpu (specifically, the buildflags action). Therefore, we create one action per target os & arch. Test: //components/cronet/android:cronet Change-Id: I6025abba8eb9f1974ef0fa6b62f79998305374a3 --- tools/gn2bp/Android.bp.swp | 2412 ++++++++++++++++++++++++++++++++---- tools/gn2bp/gn_utils.py | 12 +- 2 files changed, 2175 insertions(+), 249 deletions(-) diff --git a/tools/gn2bp/Android.bp.swp b/tools/gn2bp/Android.bp.swp index 79e6ba77f9..a212a14030 100644 --- a/tools/gn2bp/Android.bp.swp +++ b/tools/gn2bp/Android.bp.swp @@ -14,9 +14,9 @@ // // This file is automatically generated by gen_android_bp. Do not edit. -// GN: //base/allocator:buildflags +// GN: //base/allocator:buildflags__android_x86 genrule { - name: "cronet_aml_base_allocator_buildflags", + name: "cronet_aml_base_allocator_buildflags__android_x86", cmd: "echo '--flags USE_PARTITION_ALLOC=\"false\" USE_ALLOCATOR_SHIM=\"true\" USE_PARTITION_ALLOC_AS_MALLOC=\"false\" USE_BACKUP_REF_PTR=\"false\" USE_ASAN_BACKUP_REF_PTR=\"false\" USE_PARTITION_ALLOC_AS_GWP_ASAN_STORE=\"false\" USE_MTE_CHECKED_PTR=\"false\" FORCE_ENABLE_RAW_PTR_EXCLUSION=\"false\"' | " + "$(location build/write_buildflag_header.py) --output " + "$(out) " + @@ -34,9 +34,49 @@ genrule { ], } -// GN: //base/allocator/partition_allocator:chromecast_buildflags +// GN: //base/allocator:buildflags__android_x86_64 genrule { - name: "cronet_aml_base_allocator_partition_allocator_chromecast_buildflags", + name: "cronet_aml_base_allocator_buildflags__android_x86_64", + cmd: "echo '--flags USE_PARTITION_ALLOC=\"false\" USE_ALLOCATOR_SHIM=\"true\" USE_PARTITION_ALLOC_AS_MALLOC=\"false\" USE_BACKUP_REF_PTR=\"false\" USE_ASAN_BACKUP_REF_PTR=\"false\" USE_PARTITION_ALLOC_AS_GWP_ASAN_STORE=\"false\" USE_MTE_CHECKED_PTR=\"false\" FORCE_ENABLE_RAW_PTR_EXCLUSION=\"false\"' | " + + "$(location build/write_buildflag_header.py) --output " + + "$(out) " + + "--rulename " + + "//base/allocator:buildflags " + + "--gen-dir " + + ". " + + "--definitions " + + "/dev/stdin", + out: [ + "base/allocator/buildflags.h", + ], + tool_files: [ + "build/write_buildflag_header.py", + ], +} + +// GN: //base/allocator:buildflags__host +genrule { + name: "cronet_aml_base_allocator_buildflags__host", + cmd: "echo '--flags USE_PARTITION_ALLOC=\"false\" USE_ALLOCATOR_SHIM=\"true\" USE_PARTITION_ALLOC_AS_MALLOC=\"false\" USE_BACKUP_REF_PTR=\"false\" USE_ASAN_BACKUP_REF_PTR=\"false\" USE_PARTITION_ALLOC_AS_GWP_ASAN_STORE=\"false\" USE_MTE_CHECKED_PTR=\"false\" FORCE_ENABLE_RAW_PTR_EXCLUSION=\"false\"' | " + + "$(location build/write_buildflag_header.py) --output " + + "$(out) " + + "--rulename " + + "//base/allocator:buildflags " + + "--gen-dir " + + ". " + + "--definitions " + + "/dev/stdin", + out: [ + "base/allocator/buildflags.h", + ], + tool_files: [ + "build/write_buildflag_header.py", + ], +} + +// GN: //base/allocator/partition_allocator:chromecast_buildflags__android_x86 +genrule { + name: "cronet_aml_base_allocator_partition_allocator_chromecast_buildflags__android_x86", cmd: "echo '--flags PA_IS_CAST_ANDROID=\"false\" PA_IS_CASTOS=\"false\"' | " + "$(location build/write_buildflag_header.py) --output " + "$(out) " + @@ -54,9 +94,49 @@ genrule { ], } -// GN: //base/allocator/partition_allocator:chromeos_buildflags +// GN: //base/allocator/partition_allocator:chromecast_buildflags__android_x86_64 genrule { - name: "cronet_aml_base_allocator_partition_allocator_chromeos_buildflags", + name: "cronet_aml_base_allocator_partition_allocator_chromecast_buildflags__android_x86_64", + cmd: "echo '--flags PA_IS_CAST_ANDROID=\"false\" PA_IS_CASTOS=\"false\"' | " + + "$(location build/write_buildflag_header.py) --output " + + "$(out) " + + "--rulename " + + "//base/allocator/partition_allocator:chromecast_buildflags " + + "--gen-dir " + + ". " + + "--definitions " + + "/dev/stdin", + out: [ + "base/allocator/partition_allocator/chromecast_buildflags.h", + ], + tool_files: [ + "build/write_buildflag_header.py", + ], +} + +// GN: //base/allocator/partition_allocator:chromecast_buildflags__host +genrule { + name: "cronet_aml_base_allocator_partition_allocator_chromecast_buildflags__host", + cmd: "echo '--flags PA_IS_CAST_ANDROID=\"false\" PA_IS_CASTOS=\"false\"' | " + + "$(location build/write_buildflag_header.py) --output " + + "$(out) " + + "--rulename " + + "//base/allocator/partition_allocator:chromecast_buildflags " + + "--gen-dir " + + ". " + + "--definitions " + + "/dev/stdin", + out: [ + "base/allocator/partition_allocator/chromecast_buildflags.h", + ], + tool_files: [ + "build/write_buildflag_header.py", + ], +} + +// GN: //base/allocator/partition_allocator:chromeos_buildflags__android_x86 +genrule { + name: "cronet_aml_base_allocator_partition_allocator_chromeos_buildflags__android_x86", cmd: "echo '--flags PA_IS_CHROMEOS_ASH=\"false\"' | " + "$(location build/write_buildflag_header.py) --output " + "$(out) " + @@ -74,9 +154,49 @@ genrule { ], } -// GN: //base/allocator/partition_allocator:debugging_buildflags +// GN: //base/allocator/partition_allocator:chromeos_buildflags__android_x86_64 genrule { - name: "cronet_aml_base_allocator_partition_allocator_debugging_buildflags", + name: "cronet_aml_base_allocator_partition_allocator_chromeos_buildflags__android_x86_64", + cmd: "echo '--flags PA_IS_CHROMEOS_ASH=\"false\"' | " + + "$(location build/write_buildflag_header.py) --output " + + "$(out) " + + "--rulename " + + "//base/allocator/partition_allocator:chromeos_buildflags " + + "--gen-dir " + + ". " + + "--definitions " + + "/dev/stdin", + out: [ + "base/allocator/partition_allocator/chromeos_buildflags.h", + ], + tool_files: [ + "build/write_buildflag_header.py", + ], +} + +// GN: //base/allocator/partition_allocator:chromeos_buildflags__host +genrule { + name: "cronet_aml_base_allocator_partition_allocator_chromeos_buildflags__host", + cmd: "echo '--flags PA_IS_CHROMEOS_ASH=\"false\"' | " + + "$(location build/write_buildflag_header.py) --output " + + "$(out) " + + "--rulename " + + "//base/allocator/partition_allocator:chromeos_buildflags " + + "--gen-dir " + + ". " + + "--definitions " + + "/dev/stdin", + out: [ + "base/allocator/partition_allocator/chromeos_buildflags.h", + ], + tool_files: [ + "build/write_buildflag_header.py", + ], +} + +// GN: //base/allocator/partition_allocator:debugging_buildflags__android_x86 +genrule { + name: "cronet_aml_base_allocator_partition_allocator_debugging_buildflags__android_x86", cmd: "echo '--flags PA_DCHECK_IS_ON=\"true\" PA_EXPENSIVE_DCHECKS_ARE_ON=\"true\" PA_DCHECK_IS_CONFIGURABLE=\"false\"' | " + "$(location build/write_buildflag_header.py) --output " + "$(out) " + @@ -94,9 +214,89 @@ genrule { ], } -// GN: //base/allocator/partition_allocator:logging_buildflags +// GN: //base/allocator/partition_allocator:debugging_buildflags__android_x86_64 genrule { - name: "cronet_aml_base_allocator_partition_allocator_logging_buildflags", + name: "cronet_aml_base_allocator_partition_allocator_debugging_buildflags__android_x86_64", + cmd: "echo '--flags PA_DCHECK_IS_ON=\"true\" PA_EXPENSIVE_DCHECKS_ARE_ON=\"true\" PA_DCHECK_IS_CONFIGURABLE=\"false\"' | " + + "$(location build/write_buildflag_header.py) --output " + + "$(out) " + + "--rulename " + + "//base/allocator/partition_allocator:debugging_buildflags " + + "--gen-dir " + + ". " + + "--definitions " + + "/dev/stdin", + out: [ + "base/allocator/partition_allocator/partition_alloc_base/debug/debugging_buildflags.h", + ], + tool_files: [ + "build/write_buildflag_header.py", + ], +} + +// GN: //base/allocator/partition_allocator:debugging_buildflags__host +genrule { + name: "cronet_aml_base_allocator_partition_allocator_debugging_buildflags__host", + cmd: "echo '--flags PA_DCHECK_IS_ON=\"true\" PA_EXPENSIVE_DCHECKS_ARE_ON=\"true\" PA_DCHECK_IS_CONFIGURABLE=\"false\"' | " + + "$(location build/write_buildflag_header.py) --output " + + "$(out) " + + "--rulename " + + "//base/allocator/partition_allocator:debugging_buildflags " + + "--gen-dir " + + ". " + + "--definitions " + + "/dev/stdin", + out: [ + "base/allocator/partition_allocator/partition_alloc_base/debug/debugging_buildflags.h", + ], + tool_files: [ + "build/write_buildflag_header.py", + ], +} + +// GN: //base/allocator/partition_allocator:logging_buildflags__android_x86 +genrule { + name: "cronet_aml_base_allocator_partition_allocator_logging_buildflags__android_x86", + cmd: "echo '--flags PA_ENABLE_LOG_ERROR_NOT_REACHED=\"false\"' | " + + "$(location build/write_buildflag_header.py) --output " + + "$(out) " + + "--rulename " + + "//base/allocator/partition_allocator:logging_buildflags " + + "--gen-dir " + + ". " + + "--definitions " + + "/dev/stdin", + out: [ + "base/allocator/partition_allocator/logging_buildflags.h", + ], + tool_files: [ + "build/write_buildflag_header.py", + ], +} + +// GN: //base/allocator/partition_allocator:logging_buildflags__android_x86_64 +genrule { + name: "cronet_aml_base_allocator_partition_allocator_logging_buildflags__android_x86_64", + cmd: "echo '--flags PA_ENABLE_LOG_ERROR_NOT_REACHED=\"false\"' | " + + "$(location build/write_buildflag_header.py) --output " + + "$(out) " + + "--rulename " + + "//base/allocator/partition_allocator:logging_buildflags " + + "--gen-dir " + + ". " + + "--definitions " + + "/dev/stdin", + out: [ + "base/allocator/partition_allocator/logging_buildflags.h", + ], + tool_files: [ + "build/write_buildflag_header.py", + ], +} + +// GN: //base/allocator/partition_allocator:logging_buildflags__host +genrule { + name: "cronet_aml_base_allocator_partition_allocator_logging_buildflags__host", cmd: "echo '--flags PA_ENABLE_LOG_ERROR_NOT_REACHED=\"false\"' | " + "$(location build/write_buildflag_header.py) --output " + "$(out) " + @@ -170,18 +370,38 @@ cc_library_static { ], host_supported: true, generated_headers: [ - "cronet_aml_base_allocator_partition_allocator_chromecast_buildflags", - "cronet_aml_base_allocator_partition_allocator_chromeos_buildflags", - "cronet_aml_base_allocator_partition_allocator_debugging_buildflags", - "cronet_aml_base_allocator_partition_allocator_logging_buildflags", - "cronet_aml_base_allocator_partition_allocator_partition_alloc_buildflags", + "cronet_aml_base_allocator_partition_allocator_chromecast_buildflags__android_x86", + "cronet_aml_base_allocator_partition_allocator_chromecast_buildflags__android_x86_64", + "cronet_aml_base_allocator_partition_allocator_chromecast_buildflags__host", + "cronet_aml_base_allocator_partition_allocator_chromeos_buildflags__android_x86", + "cronet_aml_base_allocator_partition_allocator_chromeos_buildflags__android_x86_64", + "cronet_aml_base_allocator_partition_allocator_chromeos_buildflags__host", + "cronet_aml_base_allocator_partition_allocator_debugging_buildflags__android_x86", + "cronet_aml_base_allocator_partition_allocator_debugging_buildflags__android_x86_64", + "cronet_aml_base_allocator_partition_allocator_debugging_buildflags__host", + "cronet_aml_base_allocator_partition_allocator_logging_buildflags__android_x86", + "cronet_aml_base_allocator_partition_allocator_logging_buildflags__android_x86_64", + "cronet_aml_base_allocator_partition_allocator_logging_buildflags__host", + "cronet_aml_base_allocator_partition_allocator_partition_alloc_buildflags__android_x86", + "cronet_aml_base_allocator_partition_allocator_partition_alloc_buildflags__android_x86_64", + "cronet_aml_base_allocator_partition_allocator_partition_alloc_buildflags__host", ], export_generated_headers: [ - "cronet_aml_base_allocator_partition_allocator_chromecast_buildflags", - "cronet_aml_base_allocator_partition_allocator_chromeos_buildflags", - "cronet_aml_base_allocator_partition_allocator_debugging_buildflags", - "cronet_aml_base_allocator_partition_allocator_logging_buildflags", - "cronet_aml_base_allocator_partition_allocator_partition_alloc_buildflags", + "cronet_aml_base_allocator_partition_allocator_chromecast_buildflags__android_x86", + "cronet_aml_base_allocator_partition_allocator_chromecast_buildflags__android_x86_64", + "cronet_aml_base_allocator_partition_allocator_chromecast_buildflags__host", + "cronet_aml_base_allocator_partition_allocator_chromeos_buildflags__android_x86", + "cronet_aml_base_allocator_partition_allocator_chromeos_buildflags__android_x86_64", + "cronet_aml_base_allocator_partition_allocator_chromeos_buildflags__host", + "cronet_aml_base_allocator_partition_allocator_debugging_buildflags__android_x86", + "cronet_aml_base_allocator_partition_allocator_debugging_buildflags__android_x86_64", + "cronet_aml_base_allocator_partition_allocator_debugging_buildflags__host", + "cronet_aml_base_allocator_partition_allocator_logging_buildflags__android_x86", + "cronet_aml_base_allocator_partition_allocator_logging_buildflags__android_x86_64", + "cronet_aml_base_allocator_partition_allocator_logging_buildflags__host", + "cronet_aml_base_allocator_partition_allocator_partition_alloc_buildflags__android_x86", + "cronet_aml_base_allocator_partition_allocator_partition_alloc_buildflags__android_x86_64", + "cronet_aml_base_allocator_partition_allocator_partition_alloc_buildflags__host", ], defaults: [ "cronet_aml_defaults", @@ -262,9 +482,9 @@ cc_library_static { }, } -// GN: //base/allocator/partition_allocator:partition_alloc_buildflags +// GN: //base/allocator/partition_allocator:partition_alloc_buildflags__android_x86 genrule { - name: "cronet_aml_base_allocator_partition_allocator_partition_alloc_buildflags", + name: "cronet_aml_base_allocator_partition_allocator_partition_alloc_buildflags__android_x86", cmd: "echo '--flags ENABLE_PARTITION_ALLOC_AS_MALLOC_SUPPORT=\"true\" ENABLE_BACKUP_REF_PTR_SUPPORT=\"true\" ENABLE_BACKUP_REF_PTR_SLOW_CHECKS=\"false\" ENABLE_DANGLING_RAW_PTR_CHECKS=\"false\" PUT_REF_COUNT_IN_PREVIOUS_SLOT=\"true\" ENABLE_GWP_ASAN_SUPPORT=\"true\" ENABLE_MTE_CHECKED_PTR_SUPPORT=\"false\" RECORD_ALLOC_INFO=\"false\" USE_FREESLOT_BITMAP=\"false\" GLUE_CORE_POOLS=\"false\" ENABLE_SHADOW_METADATA_FOR_64_BITS_POINTERS=\"false\" STARSCAN=\"true\" PA_USE_BASE_TRACING=\"true\" ENABLE_PKEYS=\"false\"' | " + "$(location build/write_buildflag_header.py) --output " + "$(out) " + @@ -282,9 +502,49 @@ genrule { ], } -// GN: //base:anchor_functions_buildflags +// GN: //base/allocator/partition_allocator:partition_alloc_buildflags__android_x86_64 genrule { - name: "cronet_aml_base_anchor_functions_buildflags", + name: "cronet_aml_base_allocator_partition_allocator_partition_alloc_buildflags__android_x86_64", + cmd: "echo '--flags ENABLE_PARTITION_ALLOC_AS_MALLOC_SUPPORT=\"true\" ENABLE_BACKUP_REF_PTR_SUPPORT=\"true\" ENABLE_BACKUP_REF_PTR_SLOW_CHECKS=\"false\" ENABLE_DANGLING_RAW_PTR_CHECKS=\"false\" PUT_REF_COUNT_IN_PREVIOUS_SLOT=\"true\" ENABLE_GWP_ASAN_SUPPORT=\"true\" ENABLE_MTE_CHECKED_PTR_SUPPORT=\"false\" RECORD_ALLOC_INFO=\"false\" USE_FREESLOT_BITMAP=\"false\" GLUE_CORE_POOLS=\"false\" ENABLE_SHADOW_METADATA_FOR_64_BITS_POINTERS=\"false\" STARSCAN=\"true\" PA_USE_BASE_TRACING=\"true\" ENABLE_PKEYS=\"false\"' | " + + "$(location build/write_buildflag_header.py) --output " + + "$(out) " + + "--rulename " + + "//base/allocator/partition_allocator:partition_alloc_buildflags " + + "--gen-dir " + + ". " + + "--definitions " + + "/dev/stdin", + out: [ + "base/allocator/partition_allocator/partition_alloc_buildflags.h", + ], + tool_files: [ + "build/write_buildflag_header.py", + ], +} + +// GN: //base/allocator/partition_allocator:partition_alloc_buildflags__host +genrule { + name: "cronet_aml_base_allocator_partition_allocator_partition_alloc_buildflags__host", + cmd: "echo '--flags ENABLE_PARTITION_ALLOC_AS_MALLOC_SUPPORT=\"true\" ENABLE_BACKUP_REF_PTR_SUPPORT=\"true\" ENABLE_BACKUP_REF_PTR_SLOW_CHECKS=\"false\" ENABLE_DANGLING_RAW_PTR_CHECKS=\"false\" PUT_REF_COUNT_IN_PREVIOUS_SLOT=\"true\" ENABLE_GWP_ASAN_SUPPORT=\"true\" ENABLE_MTE_CHECKED_PTR_SUPPORT=\"false\" RECORD_ALLOC_INFO=\"false\" USE_FREESLOT_BITMAP=\"false\" GLUE_CORE_POOLS=\"false\" ENABLE_SHADOW_METADATA_FOR_64_BITS_POINTERS=\"false\" STARSCAN=\"true\" PA_USE_BASE_TRACING=\"true\" ENABLE_PKEYS=\"true\"' | " + + "$(location build/write_buildflag_header.py) --output " + + "$(out) " + + "--rulename " + + "//base/allocator/partition_allocator:partition_alloc_buildflags " + + "--gen-dir " + + ". " + + "--definitions " + + "/dev/stdin", + out: [ + "base/allocator/partition_allocator/partition_alloc_buildflags.h", + ], + tool_files: [ + "build/write_buildflag_header.py", + ], +} + +// GN: //base:anchor_functions_buildflags__android_x86 +genrule { + name: "cronet_aml_base_anchor_functions_buildflags__android_x86", cmd: "echo '--flags USE_LLD=\"true\" SUPPORTS_CODE_ORDERING=\"true\"' | " + "$(location build/write_buildflag_header.py) --output " + "$(out) " + @@ -302,9 +562,86 @@ genrule { ], } -// GN: //base:android_runtime_jni_headers +// GN: //base:anchor_functions_buildflags__android_x86_64 genrule { - name: "cronet_aml_base_android_runtime_jni_headers", + name: "cronet_aml_base_anchor_functions_buildflags__android_x86_64", + cmd: "echo '--flags USE_LLD=\"true\" SUPPORTS_CODE_ORDERING=\"true\"' | " + + "$(location build/write_buildflag_header.py) --output " + + "$(out) " + + "--rulename " + + "//base:anchor_functions_buildflags " + + "--gen-dir " + + ". " + + "--definitions " + + "/dev/stdin", + out: [ + "base/android/library_loader/anchor_functions_buildflags.h", + ], + tool_files: [ + "build/write_buildflag_header.py", + ], +} + +// GN: //base:anchor_functions_buildflags__host +genrule { + name: "cronet_aml_base_anchor_functions_buildflags__host", + cmd: "echo '--flags USE_LLD=\"true\" SUPPORTS_CODE_ORDERING=\"false\"' | " + + "$(location build/write_buildflag_header.py) --output " + + "$(out) " + + "--rulename " + + "//base:anchor_functions_buildflags " + + "--gen-dir " + + ". " + + "--definitions " + + "/dev/stdin", + out: [ + "base/android/library_loader/anchor_functions_buildflags.h", + ], + tool_files: [ + "build/write_buildflag_header.py", + ], +} + +// GN: //base:android_runtime_jni_headers__android_x86 +genrule { + name: "cronet_aml_base_android_runtime_jni_headers__android_x86", + cmd: "$(location base/android/jni_generator/jni_generator.py) --ptr_type " + + "long " + + " " + + " " + + "--output_dir " + + "$(genDir)/base/android_runtime_jni_headers " + + "--includes " + + "base/android/jni_generator/jni_generator_helper.h " + + "--jar_file " + + "$(location third_party/android_sdk/public/platforms/android-33/android.jar) " + + "--output_name " + + "Runnable_jni.h " + + "--output_name " + + "Runtime_jni.h " + + "--input_file " + + "java/lang/Runnable.class " + + "--input_file " + + "java/lang/Runtime.class " + + "--javap " + + "$$(find out/.path -name javap)", + out: [ + "base/android_runtime_jni_headers/Runnable_jni.h", + "base/android_runtime_jni_headers/Runtime_jni.h", + ], + tool_files: [ + "base/android/jni_generator/android_jar.classes", + "base/android/jni_generator/jni_generator.py", + "build/android/gyp/util/__init__.py", + "build/android/gyp/util/build_utils.py", + "build/gn_helpers.py", + "third_party/android_sdk/public/platforms/android-33/android.jar", + ], +} + +// GN: //base:android_runtime_jni_headers__android_x86_64 +genrule { + name: "cronet_aml_base_android_runtime_jni_headers__android_x86_64", cmd: "$(location base/android/jni_generator/jni_generator.py) --ptr_type " + "long " + " " + @@ -720,64 +1057,172 @@ cc_library_static { ], host_supported: true, generated_headers: [ - "cronet_aml_base_allocator_buildflags", - "cronet_aml_base_allocator_partition_allocator_chromecast_buildflags", - "cronet_aml_base_allocator_partition_allocator_chromeos_buildflags", - "cronet_aml_base_allocator_partition_allocator_debugging_buildflags", - "cronet_aml_base_allocator_partition_allocator_logging_buildflags", - "cronet_aml_base_allocator_partition_allocator_partition_alloc_buildflags", - "cronet_aml_base_anchor_functions_buildflags", - "cronet_aml_base_android_runtime_jni_headers", - "cronet_aml_base_base_jni_headers", - "cronet_aml_base_build_date", - "cronet_aml_base_cfi_buildflags", - "cronet_aml_base_clang_profiling_buildflags", - "cronet_aml_base_debugging_buildflags", - "cronet_aml_base_feature_list_buildflags", - "cronet_aml_base_ios_cronet_buildflags", - "cronet_aml_base_logging_buildflags", - "cronet_aml_base_message_pump_buildflags", - "cronet_aml_base_orderfile_buildflags", - "cronet_aml_base_parsing_buildflags", - "cronet_aml_base_power_monitor_buildflags", - "cronet_aml_base_profiler_buildflags", - "cronet_aml_base_sanitizer_buildflags", - "cronet_aml_base_synchronization_buildflags", - "cronet_aml_base_tracing_buildflags", - "cronet_aml_build_branding_buildflags", - "cronet_aml_build_chromecast_buildflags", - "cronet_aml_build_chromeos_buildflags", - "cronet_aml_build_config_compiler_compiler_buildflags", + "cronet_aml_base_allocator_buildflags__android_x86", + "cronet_aml_base_allocator_buildflags__android_x86_64", + "cronet_aml_base_allocator_buildflags__host", + "cronet_aml_base_allocator_partition_allocator_chromecast_buildflags__android_x86", + "cronet_aml_base_allocator_partition_allocator_chromecast_buildflags__android_x86_64", + "cronet_aml_base_allocator_partition_allocator_chromecast_buildflags__host", + "cronet_aml_base_allocator_partition_allocator_chromeos_buildflags__android_x86", + "cronet_aml_base_allocator_partition_allocator_chromeos_buildflags__android_x86_64", + "cronet_aml_base_allocator_partition_allocator_chromeos_buildflags__host", + "cronet_aml_base_allocator_partition_allocator_debugging_buildflags__android_x86", + "cronet_aml_base_allocator_partition_allocator_debugging_buildflags__android_x86_64", + "cronet_aml_base_allocator_partition_allocator_debugging_buildflags__host", + "cronet_aml_base_allocator_partition_allocator_logging_buildflags__android_x86", + "cronet_aml_base_allocator_partition_allocator_logging_buildflags__android_x86_64", + "cronet_aml_base_allocator_partition_allocator_logging_buildflags__host", + "cronet_aml_base_allocator_partition_allocator_partition_alloc_buildflags__android_x86", + "cronet_aml_base_allocator_partition_allocator_partition_alloc_buildflags__android_x86_64", + "cronet_aml_base_allocator_partition_allocator_partition_alloc_buildflags__host", + "cronet_aml_base_anchor_functions_buildflags__android_x86", + "cronet_aml_base_anchor_functions_buildflags__android_x86_64", + "cronet_aml_base_anchor_functions_buildflags__host", + "cronet_aml_base_android_runtime_jni_headers__android_x86", + "cronet_aml_base_android_runtime_jni_headers__android_x86_64", + "cronet_aml_base_base_jni_headers__android_x86", + "cronet_aml_base_base_jni_headers__android_x86_64", + "cronet_aml_base_build_date__android_x86", + "cronet_aml_base_build_date__android_x86_64", + "cronet_aml_base_build_date__host", + "cronet_aml_base_cfi_buildflags__android_x86", + "cronet_aml_base_cfi_buildflags__android_x86_64", + "cronet_aml_base_cfi_buildflags__host", + "cronet_aml_base_clang_profiling_buildflags__android_x86", + "cronet_aml_base_clang_profiling_buildflags__android_x86_64", + "cronet_aml_base_clang_profiling_buildflags__host", + "cronet_aml_base_debugging_buildflags__android_x86", + "cronet_aml_base_debugging_buildflags__android_x86_64", + "cronet_aml_base_debugging_buildflags__host", + "cronet_aml_base_feature_list_buildflags__android_x86", + "cronet_aml_base_feature_list_buildflags__android_x86_64", + "cronet_aml_base_feature_list_buildflags__host", + "cronet_aml_base_ios_cronet_buildflags__android_x86", + "cronet_aml_base_ios_cronet_buildflags__android_x86_64", + "cronet_aml_base_ios_cronet_buildflags__host", + "cronet_aml_base_logging_buildflags__android_x86", + "cronet_aml_base_logging_buildflags__android_x86_64", + "cronet_aml_base_logging_buildflags__host", + "cronet_aml_base_message_pump_buildflags__android_x86", + "cronet_aml_base_message_pump_buildflags__android_x86_64", + "cronet_aml_base_message_pump_buildflags__host", + "cronet_aml_base_orderfile_buildflags__android_x86", + "cronet_aml_base_orderfile_buildflags__android_x86_64", + "cronet_aml_base_orderfile_buildflags__host", + "cronet_aml_base_parsing_buildflags__android_x86", + "cronet_aml_base_parsing_buildflags__android_x86_64", + "cronet_aml_base_parsing_buildflags__host", + "cronet_aml_base_power_monitor_buildflags__android_x86", + "cronet_aml_base_power_monitor_buildflags__android_x86_64", + "cronet_aml_base_power_monitor_buildflags__host", + "cronet_aml_base_profiler_buildflags__android_x86", + "cronet_aml_base_profiler_buildflags__android_x86_64", + "cronet_aml_base_profiler_buildflags__host", + "cronet_aml_base_sanitizer_buildflags__android_x86", + "cronet_aml_base_sanitizer_buildflags__android_x86_64", + "cronet_aml_base_sanitizer_buildflags__host", + "cronet_aml_base_synchronization_buildflags__android_x86", + "cronet_aml_base_synchronization_buildflags__android_x86_64", + "cronet_aml_base_synchronization_buildflags__host", + "cronet_aml_base_tracing_buildflags__android_x86", + "cronet_aml_base_tracing_buildflags__android_x86_64", + "cronet_aml_base_tracing_buildflags__host", + "cronet_aml_build_branding_buildflags__android_x86", + "cronet_aml_build_branding_buildflags__android_x86_64", + "cronet_aml_build_branding_buildflags__host", + "cronet_aml_build_chromecast_buildflags__android_x86", + "cronet_aml_build_chromecast_buildflags__android_x86_64", + "cronet_aml_build_chromecast_buildflags__host", + "cronet_aml_build_chromeos_buildflags__android_x86", + "cronet_aml_build_chromeos_buildflags__android_x86_64", + "cronet_aml_build_chromeos_buildflags__host", + "cronet_aml_build_config_compiler_compiler_buildflags__android_x86", + "cronet_aml_build_config_compiler_compiler_buildflags__android_x86_64", + "cronet_aml_build_config_compiler_compiler_buildflags__host", ], export_generated_headers: [ - "cronet_aml_base_allocator_buildflags", - "cronet_aml_base_allocator_partition_allocator_chromecast_buildflags", - "cronet_aml_base_allocator_partition_allocator_chromeos_buildflags", - "cronet_aml_base_allocator_partition_allocator_debugging_buildflags", - "cronet_aml_base_allocator_partition_allocator_logging_buildflags", - "cronet_aml_base_allocator_partition_allocator_partition_alloc_buildflags", - "cronet_aml_base_anchor_functions_buildflags", - "cronet_aml_base_android_runtime_jni_headers", - "cronet_aml_base_base_jni_headers", - "cronet_aml_base_build_date", - "cronet_aml_base_cfi_buildflags", - "cronet_aml_base_clang_profiling_buildflags", - "cronet_aml_base_debugging_buildflags", - "cronet_aml_base_feature_list_buildflags", - "cronet_aml_base_ios_cronet_buildflags", - "cronet_aml_base_logging_buildflags", - "cronet_aml_base_message_pump_buildflags", - "cronet_aml_base_orderfile_buildflags", - "cronet_aml_base_parsing_buildflags", - "cronet_aml_base_power_monitor_buildflags", - "cronet_aml_base_profiler_buildflags", - "cronet_aml_base_sanitizer_buildflags", - "cronet_aml_base_synchronization_buildflags", - "cronet_aml_base_tracing_buildflags", - "cronet_aml_build_branding_buildflags", - "cronet_aml_build_chromecast_buildflags", - "cronet_aml_build_chromeos_buildflags", - "cronet_aml_build_config_compiler_compiler_buildflags", + "cronet_aml_base_allocator_buildflags__android_x86", + "cronet_aml_base_allocator_buildflags__android_x86_64", + "cronet_aml_base_allocator_buildflags__host", + "cronet_aml_base_allocator_partition_allocator_chromecast_buildflags__android_x86", + "cronet_aml_base_allocator_partition_allocator_chromecast_buildflags__android_x86_64", + "cronet_aml_base_allocator_partition_allocator_chromecast_buildflags__host", + "cronet_aml_base_allocator_partition_allocator_chromeos_buildflags__android_x86", + "cronet_aml_base_allocator_partition_allocator_chromeos_buildflags__android_x86_64", + "cronet_aml_base_allocator_partition_allocator_chromeos_buildflags__host", + "cronet_aml_base_allocator_partition_allocator_debugging_buildflags__android_x86", + "cronet_aml_base_allocator_partition_allocator_debugging_buildflags__android_x86_64", + "cronet_aml_base_allocator_partition_allocator_debugging_buildflags__host", + "cronet_aml_base_allocator_partition_allocator_logging_buildflags__android_x86", + "cronet_aml_base_allocator_partition_allocator_logging_buildflags__android_x86_64", + "cronet_aml_base_allocator_partition_allocator_logging_buildflags__host", + "cronet_aml_base_allocator_partition_allocator_partition_alloc_buildflags__android_x86", + "cronet_aml_base_allocator_partition_allocator_partition_alloc_buildflags__android_x86_64", + "cronet_aml_base_allocator_partition_allocator_partition_alloc_buildflags__host", + "cronet_aml_base_anchor_functions_buildflags__android_x86", + "cronet_aml_base_anchor_functions_buildflags__android_x86_64", + "cronet_aml_base_anchor_functions_buildflags__host", + "cronet_aml_base_android_runtime_jni_headers__android_x86", + "cronet_aml_base_android_runtime_jni_headers__android_x86_64", + "cronet_aml_base_base_jni_headers__android_x86", + "cronet_aml_base_base_jni_headers__android_x86_64", + "cronet_aml_base_build_date__android_x86", + "cronet_aml_base_build_date__android_x86_64", + "cronet_aml_base_build_date__host", + "cronet_aml_base_cfi_buildflags__android_x86", + "cronet_aml_base_cfi_buildflags__android_x86_64", + "cronet_aml_base_cfi_buildflags__host", + "cronet_aml_base_clang_profiling_buildflags__android_x86", + "cronet_aml_base_clang_profiling_buildflags__android_x86_64", + "cronet_aml_base_clang_profiling_buildflags__host", + "cronet_aml_base_debugging_buildflags__android_x86", + "cronet_aml_base_debugging_buildflags__android_x86_64", + "cronet_aml_base_debugging_buildflags__host", + "cronet_aml_base_feature_list_buildflags__android_x86", + "cronet_aml_base_feature_list_buildflags__android_x86_64", + "cronet_aml_base_feature_list_buildflags__host", + "cronet_aml_base_ios_cronet_buildflags__android_x86", + "cronet_aml_base_ios_cronet_buildflags__android_x86_64", + "cronet_aml_base_ios_cronet_buildflags__host", + "cronet_aml_base_logging_buildflags__android_x86", + "cronet_aml_base_logging_buildflags__android_x86_64", + "cronet_aml_base_logging_buildflags__host", + "cronet_aml_base_message_pump_buildflags__android_x86", + "cronet_aml_base_message_pump_buildflags__android_x86_64", + "cronet_aml_base_message_pump_buildflags__host", + "cronet_aml_base_orderfile_buildflags__android_x86", + "cronet_aml_base_orderfile_buildflags__android_x86_64", + "cronet_aml_base_orderfile_buildflags__host", + "cronet_aml_base_parsing_buildflags__android_x86", + "cronet_aml_base_parsing_buildflags__android_x86_64", + "cronet_aml_base_parsing_buildflags__host", + "cronet_aml_base_power_monitor_buildflags__android_x86", + "cronet_aml_base_power_monitor_buildflags__android_x86_64", + "cronet_aml_base_power_monitor_buildflags__host", + "cronet_aml_base_profiler_buildflags__android_x86", + "cronet_aml_base_profiler_buildflags__android_x86_64", + "cronet_aml_base_profiler_buildflags__host", + "cronet_aml_base_sanitizer_buildflags__android_x86", + "cronet_aml_base_sanitizer_buildflags__android_x86_64", + "cronet_aml_base_sanitizer_buildflags__host", + "cronet_aml_base_synchronization_buildflags__android_x86", + "cronet_aml_base_synchronization_buildflags__android_x86_64", + "cronet_aml_base_synchronization_buildflags__host", + "cronet_aml_base_tracing_buildflags__android_x86", + "cronet_aml_base_tracing_buildflags__android_x86_64", + "cronet_aml_base_tracing_buildflags__host", + "cronet_aml_build_branding_buildflags__android_x86", + "cronet_aml_build_branding_buildflags__android_x86_64", + "cronet_aml_build_branding_buildflags__host", + "cronet_aml_build_chromecast_buildflags__android_x86", + "cronet_aml_build_chromecast_buildflags__android_x86_64", + "cronet_aml_build_chromecast_buildflags__host", + "cronet_aml_build_chromeos_buildflags__android_x86", + "cronet_aml_build_chromeos_buildflags__android_x86_64", + "cronet_aml_build_chromeos_buildflags__host", + "cronet_aml_build_config_compiler_compiler_buildflags__android_x86", + "cronet_aml_build_config_compiler_compiler_buildflags__android_x86_64", + "cronet_aml_build_config_compiler_compiler_buildflags__host", ], defaults: [ "cronet_aml_base_numerics_base_numerics", @@ -1140,9 +1585,274 @@ cc_library_static { }, } -// GN: //base:base_jni_headers +// GN: //base:base_jni_headers__android_x86 genrule { - name: "cronet_aml_base_base_jni_headers", + name: "cronet_aml_base_base_jni_headers__android_x86", + srcs: [ + "base/android/java/src/org/chromium/base/ApkAssets.java", + "base/android/java/src/org/chromium/base/ApplicationStatus.java", + "base/android/java/src/org/chromium/base/BaseFeatureList.java", + "base/android/java/src/org/chromium/base/BuildInfo.java", + "base/android/java/src/org/chromium/base/BundleUtils.java", + "base/android/java/src/org/chromium/base/Callback.java", + "base/android/java/src/org/chromium/base/CommandLine.java", + "base/android/java/src/org/chromium/base/ContentUriUtils.java", + "base/android/java/src/org/chromium/base/CpuFeatures.java", + "base/android/java/src/org/chromium/base/EarlyTraceEvent.java", + "base/android/java/src/org/chromium/base/EventLog.java", + "base/android/java/src/org/chromium/base/FeatureList.java", + "base/android/java/src/org/chromium/base/Features.java", + "base/android/java/src/org/chromium/base/FieldTrialList.java", + "base/android/java/src/org/chromium/base/FileUtils.java", + "base/android/java/src/org/chromium/base/ImportantFileWriterAndroid.java", + "base/android/java/src/org/chromium/base/IntStringCallback.java", + "base/android/java/src/org/chromium/base/JNIUtils.java", + "base/android/java/src/org/chromium/base/JavaExceptionReporter.java", + "base/android/java/src/org/chromium/base/JavaHandlerThread.java", + "base/android/java/src/org/chromium/base/LocaleUtils.java", + "base/android/java/src/org/chromium/base/MemoryPressureListener.java", + "base/android/java/src/org/chromium/base/PathService.java", + "base/android/java/src/org/chromium/base/PathUtils.java", + "base/android/java/src/org/chromium/base/PowerMonitor.java", + "base/android/java/src/org/chromium/base/RadioUtils.java", + "base/android/java/src/org/chromium/base/SysUtils.java", + "base/android/java/src/org/chromium/base/ThreadUtils.java", + "base/android/java/src/org/chromium/base/TimezoneUtils.java", + "base/android/java/src/org/chromium/base/TraceEvent.java", + "base/android/java/src/org/chromium/base/UnguessableToken.java", + "base/android/java/src/org/chromium/base/jank_tracker/JankMetricUMARecorder.java", + "base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java", + "base/android/java/src/org/chromium/base/library_loader/LibraryPrefetcher.java", + "base/android/java/src/org/chromium/base/memory/JavaHeapDumpGenerator.java", + "base/android/java/src/org/chromium/base/metrics/NativeUmaRecorder.java", + "base/android/java/src/org/chromium/base/metrics/StatisticsRecorderAndroid.java", + "base/android/java/src/org/chromium/base/process_launcher/ChildProcessService.java", + "base/android/java/src/org/chromium/base/task/PostTask.java", + "base/android/java/src/org/chromium/base/task/TaskRunnerImpl.java", + ], + cmd: "$(location base/android/jni_generator/jni_generator.py) --ptr_type " + + "long " + + " " + + " " + + "--output_dir " + + "$(genDir)/base/base_jni_headers " + + "--includes " + + "base/android/jni_generator/jni_generator_helper.h " + + "--use_proxy_hash " + + "--output_name " + + "ApkAssets_jni.h " + + "--output_name " + + "ApplicationStatus_jni.h " + + "--output_name " + + "BaseFeatureList_jni.h " + + "--output_name " + + "BuildInfo_jni.h " + + "--output_name " + + "BundleUtils_jni.h " + + "--output_name " + + "Callback_jni.h " + + "--output_name " + + "CommandLine_jni.h " + + "--output_name " + + "ContentUriUtils_jni.h " + + "--output_name " + + "CpuFeatures_jni.h " + + "--output_name " + + "EarlyTraceEvent_jni.h " + + "--output_name " + + "EventLog_jni.h " + + "--output_name " + + "FeatureList_jni.h " + + "--output_name " + + "Features_jni.h " + + "--output_name " + + "FieldTrialList_jni.h " + + "--output_name " + + "FileUtils_jni.h " + + "--output_name " + + "ImportantFileWriterAndroid_jni.h " + + "--output_name " + + "IntStringCallback_jni.h " + + "--output_name " + + "JNIUtils_jni.h " + + "--output_name " + + "JavaExceptionReporter_jni.h " + + "--output_name " + + "JavaHandlerThread_jni.h " + + "--output_name " + + "LocaleUtils_jni.h " + + "--output_name " + + "MemoryPressureListener_jni.h " + + "--output_name " + + "PathService_jni.h " + + "--output_name " + + "PathUtils_jni.h " + + "--output_name " + + "PowerMonitor_jni.h " + + "--output_name " + + "RadioUtils_jni.h " + + "--output_name " + + "SysUtils_jni.h " + + "--output_name " + + "ThreadUtils_jni.h " + + "--output_name " + + "TimezoneUtils_jni.h " + + "--output_name " + + "TraceEvent_jni.h " + + "--output_name " + + "UnguessableToken_jni.h " + + "--output_name " + + "JankMetricUMARecorder_jni.h " + + "--output_name " + + "LibraryLoader_jni.h " + + "--output_name " + + "LibraryPrefetcher_jni.h " + + "--output_name " + + "JavaHeapDumpGenerator_jni.h " + + "--output_name " + + "NativeUmaRecorder_jni.h " + + "--output_name " + + "StatisticsRecorderAndroid_jni.h " + + "--output_name " + + "ChildProcessService_jni.h " + + "--output_name " + + "PostTask_jni.h " + + "--output_name " + + "TaskRunnerImpl_jni.h " + + "--input_file " + + "$(location base/android/java/src/org/chromium/base/ApkAssets.java) " + + "--input_file " + + "$(location base/android/java/src/org/chromium/base/ApplicationStatus.java) " + + "--input_file " + + "$(location base/android/java/src/org/chromium/base/BaseFeatureList.java) " + + "--input_file " + + "$(location base/android/java/src/org/chromium/base/BuildInfo.java) " + + "--input_file " + + "$(location base/android/java/src/org/chromium/base/BundleUtils.java) " + + "--input_file " + + "$(location base/android/java/src/org/chromium/base/Callback.java) " + + "--input_file " + + "$(location base/android/java/src/org/chromium/base/CommandLine.java) " + + "--input_file " + + "$(location base/android/java/src/org/chromium/base/ContentUriUtils.java) " + + "--input_file " + + "$(location base/android/java/src/org/chromium/base/CpuFeatures.java) " + + "--input_file " + + "$(location base/android/java/src/org/chromium/base/EarlyTraceEvent.java) " + + "--input_file " + + "$(location base/android/java/src/org/chromium/base/EventLog.java) " + + "--input_file " + + "$(location base/android/java/src/org/chromium/base/FeatureList.java) " + + "--input_file " + + "$(location base/android/java/src/org/chromium/base/Features.java) " + + "--input_file " + + "$(location base/android/java/src/org/chromium/base/FieldTrialList.java) " + + "--input_file " + + "$(location base/android/java/src/org/chromium/base/FileUtils.java) " + + "--input_file " + + "$(location base/android/java/src/org/chromium/base/ImportantFileWriterAndroid.java) " + + "--input_file " + + "$(location base/android/java/src/org/chromium/base/IntStringCallback.java) " + + "--input_file " + + "$(location base/android/java/src/org/chromium/base/JNIUtils.java) " + + "--input_file " + + "$(location base/android/java/src/org/chromium/base/JavaExceptionReporter.java) " + + "--input_file " + + "$(location base/android/java/src/org/chromium/base/JavaHandlerThread.java) " + + "--input_file " + + "$(location base/android/java/src/org/chromium/base/LocaleUtils.java) " + + "--input_file " + + "$(location base/android/java/src/org/chromium/base/MemoryPressureListener.java) " + + "--input_file " + + "$(location base/android/java/src/org/chromium/base/PathService.java) " + + "--input_file " + + "$(location base/android/java/src/org/chromium/base/PathUtils.java) " + + "--input_file " + + "$(location base/android/java/src/org/chromium/base/PowerMonitor.java) " + + "--input_file " + + "$(location base/android/java/src/org/chromium/base/RadioUtils.java) " + + "--input_file " + + "$(location base/android/java/src/org/chromium/base/SysUtils.java) " + + "--input_file " + + "$(location base/android/java/src/org/chromium/base/ThreadUtils.java) " + + "--input_file " + + "$(location base/android/java/src/org/chromium/base/TimezoneUtils.java) " + + "--input_file " + + "$(location base/android/java/src/org/chromium/base/TraceEvent.java) " + + "--input_file " + + "$(location base/android/java/src/org/chromium/base/UnguessableToken.java) " + + "--input_file " + + "$(location base/android/java/src/org/chromium/base/jank_tracker/JankMetricUMARecorder.java) " + + "--input_file " + + "$(location base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java) " + + "--input_file " + + "$(location base/android/java/src/org/chromium/base/library_loader/LibraryPrefetcher.java) " + + "--input_file " + + "$(location base/android/java/src/org/chromium/base/memory/JavaHeapDumpGenerator.java) " + + "--input_file " + + "$(location base/android/java/src/org/chromium/base/metrics/NativeUmaRecorder.java) " + + "--input_file " + + "$(location base/android/java/src/org/chromium/base/metrics/StatisticsRecorderAndroid.java) " + + "--input_file " + + "$(location base/android/java/src/org/chromium/base/process_launcher/ChildProcessService.java) " + + "--input_file " + + "$(location base/android/java/src/org/chromium/base/task/PostTask.java) " + + "--input_file " + + "$(location base/android/java/src/org/chromium/base/task/TaskRunnerImpl.java)", + out: [ + "base/base_jni_headers/ApkAssets_jni.h", + "base/base_jni_headers/ApplicationStatus_jni.h", + "base/base_jni_headers/BaseFeatureList_jni.h", + "base/base_jni_headers/BuildInfo_jni.h", + "base/base_jni_headers/BundleUtils_jni.h", + "base/base_jni_headers/Callback_jni.h", + "base/base_jni_headers/ChildProcessService_jni.h", + "base/base_jni_headers/CommandLine_jni.h", + "base/base_jni_headers/ContentUriUtils_jni.h", + "base/base_jni_headers/CpuFeatures_jni.h", + "base/base_jni_headers/EarlyTraceEvent_jni.h", + "base/base_jni_headers/EventLog_jni.h", + "base/base_jni_headers/FeatureList_jni.h", + "base/base_jni_headers/Features_jni.h", + "base/base_jni_headers/FieldTrialList_jni.h", + "base/base_jni_headers/FileUtils_jni.h", + "base/base_jni_headers/ImportantFileWriterAndroid_jni.h", + "base/base_jni_headers/IntStringCallback_jni.h", + "base/base_jni_headers/JNIUtils_jni.h", + "base/base_jni_headers/JankMetricUMARecorder_jni.h", + "base/base_jni_headers/JavaExceptionReporter_jni.h", + "base/base_jni_headers/JavaHandlerThread_jni.h", + "base/base_jni_headers/JavaHeapDumpGenerator_jni.h", + "base/base_jni_headers/LibraryLoader_jni.h", + "base/base_jni_headers/LibraryPrefetcher_jni.h", + "base/base_jni_headers/LocaleUtils_jni.h", + "base/base_jni_headers/MemoryPressureListener_jni.h", + "base/base_jni_headers/NativeUmaRecorder_jni.h", + "base/base_jni_headers/PathService_jni.h", + "base/base_jni_headers/PathUtils_jni.h", + "base/base_jni_headers/PostTask_jni.h", + "base/base_jni_headers/PowerMonitor_jni.h", + "base/base_jni_headers/RadioUtils_jni.h", + "base/base_jni_headers/StatisticsRecorderAndroid_jni.h", + "base/base_jni_headers/SysUtils_jni.h", + "base/base_jni_headers/TaskRunnerImpl_jni.h", + "base/base_jni_headers/ThreadUtils_jni.h", + "base/base_jni_headers/TimezoneUtils_jni.h", + "base/base_jni_headers/TraceEvent_jni.h", + "base/base_jni_headers/UnguessableToken_jni.h", + ], + tool_files: [ + "base/android/jni_generator/android_jar.classes", + "base/android/jni_generator/jni_generator.py", + "build/android/gyp/util/__init__.py", + "build/android/gyp/util/build_utils.py", + "build/gn_helpers.py", + ], +} + +// GN: //base:base_jni_headers__android_x86_64 +genrule { + name: "cronet_aml_base_base_jni_headers__android_x86_64", srcs: [ "base/android/java/src/org/chromium/base/ApkAssets.java", "base/android/java/src/org/chromium/base/ApplicationStatus.java", @@ -1413,10 +2123,14 @@ cc_library_static { ], host_supported: true, generated_headers: [ - "cronet_aml_build_chromeos_buildflags", + "cronet_aml_build_chromeos_buildflags__android_x86", + "cronet_aml_build_chromeos_buildflags__android_x86_64", + "cronet_aml_build_chromeos_buildflags__host", ], export_generated_headers: [ - "cronet_aml_build_chromeos_buildflags", + "cronet_aml_build_chromeos_buildflags__android_x86", + "cronet_aml_build_chromeos_buildflags__android_x86_64", + "cronet_aml_build_chromeos_buildflags__host", ], defaults: [ "cronet_aml_defaults", @@ -1471,9 +2185,9 @@ cc_library_static { }, } -// GN: //base:build_date +// GN: //base:build_date__android_x86 genrule { - name: "cronet_aml_base_build_date", + name: "cronet_aml_base_build_date__android_x86", cmd: "$(location build/write_build_date_header.py) $(out) " + "1664686800", out: [ @@ -1484,9 +2198,35 @@ genrule { ], } -// GN: //base:cfi_buildflags +// GN: //base:build_date__android_x86_64 genrule { - name: "cronet_aml_base_cfi_buildflags", + name: "cronet_aml_base_build_date__android_x86_64", + cmd: "$(location build/write_build_date_header.py) $(out) " + + "1664686800", + out: [ + "base/generated_build_date.h", + ], + tool_files: [ + "build/write_build_date_header.py", + ], +} + +// GN: //base:build_date__host +genrule { + name: "cronet_aml_base_build_date__host", + cmd: "$(location build/write_build_date_header.py) $(out) " + + "1664686800", + out: [ + "base/generated_build_date.h", + ], + tool_files: [ + "build/write_build_date_header.py", + ], +} + +// GN: //base:cfi_buildflags__android_x86 +genrule { + name: "cronet_aml_base_cfi_buildflags__android_x86", cmd: "echo '--flags CFI_CAST_CHECK=\"false && false\" CFI_DIAG=\"false && false\" CFI_ICALL_CHECK=\"false && false\" CFI_ENFORCEMENT_TRAP=\"false && !false\" CFI_ENFORCEMENT_DIAGNOSTIC=\"false && false && !false\"' | " + "$(location build/write_buildflag_header.py) --output " + "$(out) " + @@ -1504,9 +2244,49 @@ genrule { ], } -// GN: //base:clang_profiling_buildflags +// GN: //base:cfi_buildflags__android_x86_64 genrule { - name: "cronet_aml_base_clang_profiling_buildflags", + name: "cronet_aml_base_cfi_buildflags__android_x86_64", + cmd: "echo '--flags CFI_CAST_CHECK=\"false && false\" CFI_DIAG=\"false && false\" CFI_ICALL_CHECK=\"false && false\" CFI_ENFORCEMENT_TRAP=\"false && !false\" CFI_ENFORCEMENT_DIAGNOSTIC=\"false && false && !false\"' | " + + "$(location build/write_buildflag_header.py) --output " + + "$(out) " + + "--rulename " + + "//base:cfi_buildflags " + + "--gen-dir " + + ". " + + "--definitions " + + "/dev/stdin", + out: [ + "base/cfi_buildflags.h", + ], + tool_files: [ + "build/write_buildflag_header.py", + ], +} + +// GN: //base:cfi_buildflags__host +genrule { + name: "cronet_aml_base_cfi_buildflags__host", + cmd: "echo '--flags CFI_CAST_CHECK=\"false && false\" CFI_DIAG=\"false && false\" CFI_ICALL_CHECK=\"false && false\" CFI_ENFORCEMENT_TRAP=\"false && !false\" CFI_ENFORCEMENT_DIAGNOSTIC=\"false && false && !false\"' | " + + "$(location build/write_buildflag_header.py) --output " + + "$(out) " + + "--rulename " + + "//base:cfi_buildflags " + + "--gen-dir " + + ". " + + "--definitions " + + "/dev/stdin", + out: [ + "base/cfi_buildflags.h", + ], + tool_files: [ + "build/write_buildflag_header.py", + ], +} + +// GN: //base:clang_profiling_buildflags__android_x86 +genrule { + name: "cronet_aml_base_clang_profiling_buildflags__android_x86", cmd: "echo '--flags CLANG_PROFILING=\"false\" CLANG_PROFILING_INSIDE_SANDBOX=\"false\" USE_CLANG_COVERAGE=\"false\"' | " + "$(location build/write_buildflag_header.py) --output " + "$(out) " + @@ -1524,9 +2304,49 @@ genrule { ], } -// GN: //base:debugging_buildflags +// GN: //base:clang_profiling_buildflags__android_x86_64 genrule { - name: "cronet_aml_base_debugging_buildflags", + name: "cronet_aml_base_clang_profiling_buildflags__android_x86_64", + cmd: "echo '--flags CLANG_PROFILING=\"false\" CLANG_PROFILING_INSIDE_SANDBOX=\"false\" USE_CLANG_COVERAGE=\"false\"' | " + + "$(location build/write_buildflag_header.py) --output " + + "$(out) " + + "--rulename " + + "//base:clang_profiling_buildflags " + + "--gen-dir " + + ". " + + "--definitions " + + "/dev/stdin", + out: [ + "base/clang_profiling_buildflags.h", + ], + tool_files: [ + "build/write_buildflag_header.py", + ], +} + +// GN: //base:clang_profiling_buildflags__host +genrule { + name: "cronet_aml_base_clang_profiling_buildflags__host", + cmd: "echo '--flags CLANG_PROFILING=\"false\" CLANG_PROFILING_INSIDE_SANDBOX=\"false\" USE_CLANG_COVERAGE=\"false\"' | " + + "$(location build/write_buildflag_header.py) --output " + + "$(out) " + + "--rulename " + + "//base:clang_profiling_buildflags " + + "--gen-dir " + + ". " + + "--definitions " + + "/dev/stdin", + out: [ + "base/clang_profiling_buildflags.h", + ], + tool_files: [ + "build/write_buildflag_header.py", + ], +} + +// GN: //base:debugging_buildflags__android_x86 +genrule { + name: "cronet_aml_base_debugging_buildflags__android_x86", cmd: "echo '--flags DCHECK_IS_CONFIGURABLE=\"false\" ENABLE_LOCATION_SOURCE=\"true\" ENABLE_PROFILING=\"false\" CAN_UNWIND_WITH_FRAME_POINTERS=\"true\" UNSAFE_DEVELOPER_BUILD=\"true\" CAN_UNWIND_WITH_CFI_TABLE=\"false\" EXCLUDE_UNWIND_TABLES=\"false\" ENABLE_GDBINIT_WARNING=\"true\" ENABLE_LLDBINIT_WARNING=\"false\" EXPENSIVE_DCHECKS_ARE_ON=\"true\" ENABLE_STACK_TRACE_LINE_NUMBERS=\"false\"' | " + "$(location build/write_buildflag_header.py) --output " + "$(out) " + @@ -1544,9 +2364,49 @@ genrule { ], } -// GN: //base:feature_list_buildflags +// GN: //base:debugging_buildflags__android_x86_64 genrule { - name: "cronet_aml_base_feature_list_buildflags", + name: "cronet_aml_base_debugging_buildflags__android_x86_64", + cmd: "echo '--flags DCHECK_IS_CONFIGURABLE=\"false\" ENABLE_LOCATION_SOURCE=\"true\" ENABLE_PROFILING=\"false\" CAN_UNWIND_WITH_FRAME_POINTERS=\"false\" UNSAFE_DEVELOPER_BUILD=\"true\" CAN_UNWIND_WITH_CFI_TABLE=\"false\" EXCLUDE_UNWIND_TABLES=\"false\" ENABLE_GDBINIT_WARNING=\"true\" ENABLE_LLDBINIT_WARNING=\"false\" EXPENSIVE_DCHECKS_ARE_ON=\"true\" ENABLE_STACK_TRACE_LINE_NUMBERS=\"false\"' | " + + "$(location build/write_buildflag_header.py) --output " + + "$(out) " + + "--rulename " + + "//base:debugging_buildflags " + + "--gen-dir " + + ". " + + "--definitions " + + "/dev/stdin", + out: [ + "base/debug/debugging_buildflags.h", + ], + tool_files: [ + "build/write_buildflag_header.py", + ], +} + +// GN: //base:debugging_buildflags__host +genrule { + name: "cronet_aml_base_debugging_buildflags__host", + cmd: "echo '--flags DCHECK_IS_CONFIGURABLE=\"false\" ENABLE_LOCATION_SOURCE=\"true\" ENABLE_PROFILING=\"false\" CAN_UNWIND_WITH_FRAME_POINTERS=\"true\" UNSAFE_DEVELOPER_BUILD=\"true\" CAN_UNWIND_WITH_CFI_TABLE=\"false\" EXCLUDE_UNWIND_TABLES=\"false\" ENABLE_GDBINIT_WARNING=\"true\" ENABLE_LLDBINIT_WARNING=\"false\" EXPENSIVE_DCHECKS_ARE_ON=\"true\" ENABLE_STACK_TRACE_LINE_NUMBERS=\"false\"' | " + + "$(location build/write_buildflag_header.py) --output " + + "$(out) " + + "--rulename " + + "//base:debugging_buildflags " + + "--gen-dir " + + ". " + + "--definitions " + + "/dev/stdin", + out: [ + "base/debug/debugging_buildflags.h", + ], + tool_files: [ + "build/write_buildflag_header.py", + ], +} + +// GN: //base:feature_list_buildflags__android_x86 +genrule { + name: "cronet_aml_base_feature_list_buildflags__android_x86", cmd: "echo '--flags ENABLE_BANNED_BASE_FEATURE_PREFIX=\"false\"' | " + "$(location build/write_buildflag_header.py) --output " + "$(out) " + @@ -1564,9 +2424,49 @@ genrule { ], } -// GN: //base:ios_cronet_buildflags +// GN: //base:feature_list_buildflags__android_x86_64 genrule { - name: "cronet_aml_base_ios_cronet_buildflags", + name: "cronet_aml_base_feature_list_buildflags__android_x86_64", + cmd: "echo '--flags ENABLE_BANNED_BASE_FEATURE_PREFIX=\"false\"' | " + + "$(location build/write_buildflag_header.py) --output " + + "$(out) " + + "--rulename " + + "//base:feature_list_buildflags " + + "--gen-dir " + + ". " + + "--definitions " + + "/dev/stdin", + out: [ + "base/feature_list_buildflags.h", + ], + tool_files: [ + "build/write_buildflag_header.py", + ], +} + +// GN: //base:feature_list_buildflags__host +genrule { + name: "cronet_aml_base_feature_list_buildflags__host", + cmd: "echo '--flags ENABLE_BANNED_BASE_FEATURE_PREFIX=\"false\"' | " + + "$(location build/write_buildflag_header.py) --output " + + "$(out) " + + "--rulename " + + "//base:feature_list_buildflags " + + "--gen-dir " + + ". " + + "--definitions " + + "/dev/stdin", + out: [ + "base/feature_list_buildflags.h", + ], + tool_files: [ + "build/write_buildflag_header.py", + ], +} + +// GN: //base:ios_cronet_buildflags__android_x86 +genrule { + name: "cronet_aml_base_ios_cronet_buildflags__android_x86", cmd: "echo '--flags CRONET_BUILD=\"false\"' | " + "$(location build/write_buildflag_header.py) --output " + "$(out) " + @@ -1584,9 +2484,49 @@ genrule { ], } -// GN: //base:logging_buildflags +// GN: //base:ios_cronet_buildflags__android_x86_64 genrule { - name: "cronet_aml_base_logging_buildflags", + name: "cronet_aml_base_ios_cronet_buildflags__android_x86_64", + cmd: "echo '--flags CRONET_BUILD=\"false\"' | " + + "$(location build/write_buildflag_header.py) --output " + + "$(out) " + + "--rulename " + + "//base:ios_cronet_buildflags " + + "--gen-dir " + + ". " + + "--definitions " + + "/dev/stdin", + out: [ + "base/message_loop/ios_cronet_buildflags.h", + ], + tool_files: [ + "build/write_buildflag_header.py", + ], +} + +// GN: //base:ios_cronet_buildflags__host +genrule { + name: "cronet_aml_base_ios_cronet_buildflags__host", + cmd: "echo '--flags CRONET_BUILD=\"false\"' | " + + "$(location build/write_buildflag_header.py) --output " + + "$(out) " + + "--rulename " + + "//base:ios_cronet_buildflags " + + "--gen-dir " + + ". " + + "--definitions " + + "/dev/stdin", + out: [ + "base/message_loop/ios_cronet_buildflags.h", + ], + tool_files: [ + "build/write_buildflag_header.py", + ], +} + +// GN: //base:logging_buildflags__android_x86 +genrule { + name: "cronet_aml_base_logging_buildflags__android_x86", cmd: "echo '--flags ENABLE_LOG_ERROR_NOT_REACHED=\"false\" USE_RUNTIME_VLOG=\"true\"' | " + "$(location build/write_buildflag_header.py) --output " + "$(out) " + @@ -1604,9 +2544,89 @@ genrule { ], } -// GN: //base:message_pump_buildflags +// GN: //base:logging_buildflags__android_x86_64 genrule { - name: "cronet_aml_base_message_pump_buildflags", + name: "cronet_aml_base_logging_buildflags__android_x86_64", + cmd: "echo '--flags ENABLE_LOG_ERROR_NOT_REACHED=\"false\" USE_RUNTIME_VLOG=\"true\"' | " + + "$(location build/write_buildflag_header.py) --output " + + "$(out) " + + "--rulename " + + "//base:logging_buildflags " + + "--gen-dir " + + ". " + + "--definitions " + + "/dev/stdin", + out: [ + "base/logging_buildflags.h", + ], + tool_files: [ + "build/write_buildflag_header.py", + ], +} + +// GN: //base:logging_buildflags__host +genrule { + name: "cronet_aml_base_logging_buildflags__host", + cmd: "echo '--flags ENABLE_LOG_ERROR_NOT_REACHED=\"false\" USE_RUNTIME_VLOG=\"true\"' | " + + "$(location build/write_buildflag_header.py) --output " + + "$(out) " + + "--rulename " + + "//base:logging_buildflags " + + "--gen-dir " + + ". " + + "--definitions " + + "/dev/stdin", + out: [ + "base/logging_buildflags.h", + ], + tool_files: [ + "build/write_buildflag_header.py", + ], +} + +// GN: //base:message_pump_buildflags__android_x86 +genrule { + name: "cronet_aml_base_message_pump_buildflags__android_x86", + cmd: "echo '--flags ENABLE_MESSAGE_PUMP_EPOLL=\"true\"' | " + + "$(location build/write_buildflag_header.py) --output " + + "$(out) " + + "--rulename " + + "//base:message_pump_buildflags " + + "--gen-dir " + + ". " + + "--definitions " + + "/dev/stdin", + out: [ + "base/message_loop/message_pump_buildflags.h", + ], + tool_files: [ + "build/write_buildflag_header.py", + ], +} + +// GN: //base:message_pump_buildflags__android_x86_64 +genrule { + name: "cronet_aml_base_message_pump_buildflags__android_x86_64", + cmd: "echo '--flags ENABLE_MESSAGE_PUMP_EPOLL=\"true\"' | " + + "$(location build/write_buildflag_header.py) --output " + + "$(out) " + + "--rulename " + + "//base:message_pump_buildflags " + + "--gen-dir " + + ". " + + "--definitions " + + "/dev/stdin", + out: [ + "base/message_loop/message_pump_buildflags.h", + ], + tool_files: [ + "build/write_buildflag_header.py", + ], +} + +// GN: //base:message_pump_buildflags__host +genrule { + name: "cronet_aml_base_message_pump_buildflags__host", cmd: "echo '--flags ENABLE_MESSAGE_PUMP_EPOLL=\"true\"' | " + "$(location build/write_buildflag_header.py) --output " + "$(out) " + @@ -1629,9 +2649,9 @@ cc_defaults { name: "cronet_aml_base_numerics_base_numerics", } -// GN: //base:orderfile_buildflags +// GN: //base:orderfile_buildflags__android_x86 genrule { - name: "cronet_aml_base_orderfile_buildflags", + name: "cronet_aml_base_orderfile_buildflags__android_x86", cmd: "echo '--flags DEVTOOLS_INSTRUMENTATION_DUMPING=\"false\" ORDERFILE_INSTRUMENTATION=\"false\"' | " + "$(location build/write_buildflag_header.py) --output " + "$(out) " + @@ -1649,9 +2669,49 @@ genrule { ], } -// GN: //base:parsing_buildflags +// GN: //base:orderfile_buildflags__android_x86_64 genrule { - name: "cronet_aml_base_parsing_buildflags", + name: "cronet_aml_base_orderfile_buildflags__android_x86_64", + cmd: "echo '--flags DEVTOOLS_INSTRUMENTATION_DUMPING=\"false\" ORDERFILE_INSTRUMENTATION=\"false\"' | " + + "$(location build/write_buildflag_header.py) --output " + + "$(out) " + + "--rulename " + + "//base:orderfile_buildflags " + + "--gen-dir " + + ". " + + "--definitions " + + "/dev/stdin", + out: [ + "base/android/orderfile/orderfile_buildflags.h", + ], + tool_files: [ + "build/write_buildflag_header.py", + ], +} + +// GN: //base:orderfile_buildflags__host +genrule { + name: "cronet_aml_base_orderfile_buildflags__host", + cmd: "echo '--flags DEVTOOLS_INSTRUMENTATION_DUMPING=\"false\" ORDERFILE_INSTRUMENTATION=\"false\"' | " + + "$(location build/write_buildflag_header.py) --output " + + "$(out) " + + "--rulename " + + "//base:orderfile_buildflags " + + "--gen-dir " + + ". " + + "--definitions " + + "/dev/stdin", + out: [ + "base/android/orderfile/orderfile_buildflags.h", + ], + tool_files: [ + "build/write_buildflag_header.py", + ], +} + +// GN: //base:parsing_buildflags__android_x86 +genrule { + name: "cronet_aml_base_parsing_buildflags__android_x86", cmd: "echo '--flags BUILD_RUST_JSON_PARSER=\"false\"' | " + "$(location build/write_buildflag_header.py) --output " + "$(out) " + @@ -1669,9 +2729,49 @@ genrule { ], } -// GN: //base:power_monitor_buildflags +// GN: //base:parsing_buildflags__android_x86_64 genrule { - name: "cronet_aml_base_power_monitor_buildflags", + name: "cronet_aml_base_parsing_buildflags__android_x86_64", + cmd: "echo '--flags BUILD_RUST_JSON_PARSER=\"false\"' | " + + "$(location build/write_buildflag_header.py) --output " + + "$(out) " + + "--rulename " + + "//base:parsing_buildflags " + + "--gen-dir " + + ". " + + "--definitions " + + "/dev/stdin", + out: [ + "base/parsing_buildflags.h", + ], + tool_files: [ + "build/write_buildflag_header.py", + ], +} + +// GN: //base:parsing_buildflags__host +genrule { + name: "cronet_aml_base_parsing_buildflags__host", + cmd: "echo '--flags BUILD_RUST_JSON_PARSER=\"false\"' | " + + "$(location build/write_buildflag_header.py) --output " + + "$(out) " + + "--rulename " + + "//base:parsing_buildflags " + + "--gen-dir " + + ". " + + "--definitions " + + "/dev/stdin", + out: [ + "base/parsing_buildflags.h", + ], + tool_files: [ + "build/write_buildflag_header.py", + ], +} + +// GN: //base:power_monitor_buildflags__android_x86 +genrule { + name: "cronet_aml_base_power_monitor_buildflags__android_x86", cmd: "echo '--flags HAS_BATTERY_LEVEL_PROVIDER_IMPL=\"false\"' | " + "$(location build/write_buildflag_header.py) --output " + "$(out) " + @@ -1689,9 +2789,49 @@ genrule { ], } -// GN: //base:profiler_buildflags +// GN: //base:power_monitor_buildflags__android_x86_64 genrule { - name: "cronet_aml_base_profiler_buildflags", + name: "cronet_aml_base_power_monitor_buildflags__android_x86_64", + cmd: "echo '--flags HAS_BATTERY_LEVEL_PROVIDER_IMPL=\"false\"' | " + + "$(location build/write_buildflag_header.py) --output " + + "$(out) " + + "--rulename " + + "//base:power_monitor_buildflags " + + "--gen-dir " + + ". " + + "--definitions " + + "/dev/stdin", + out: [ + "base/power_monitor/power_monitor_buildflags.h", + ], + tool_files: [ + "build/write_buildflag_header.py", + ], +} + +// GN: //base:power_monitor_buildflags__host +genrule { + name: "cronet_aml_base_power_monitor_buildflags__host", + cmd: "echo '--flags HAS_BATTERY_LEVEL_PROVIDER_IMPL=\"false\"' | " + + "$(location build/write_buildflag_header.py) --output " + + "$(out) " + + "--rulename " + + "//base:power_monitor_buildflags " + + "--gen-dir " + + ". " + + "--definitions " + + "/dev/stdin", + out: [ + "base/power_monitor/power_monitor_buildflags.h", + ], + tool_files: [ + "build/write_buildflag_header.py", + ], +} + +// GN: //base:profiler_buildflags__android_x86 +genrule { + name: "cronet_aml_base_profiler_buildflags__android_x86", cmd: "echo '--flags ENABLE_ARM_CFI_TABLE=\"false\" IOS_STACK_PROFILER_ENABLED=\"true\" USE_ANDROID_UNWINDER_V2=\"true\"' | " + "$(location build/write_buildflag_header.py) --output " + "$(out) " + @@ -1709,9 +2849,49 @@ genrule { ], } -// GN: //base:sanitizer_buildflags +// GN: //base:profiler_buildflags__android_x86_64 genrule { - name: "cronet_aml_base_sanitizer_buildflags", + name: "cronet_aml_base_profiler_buildflags__android_x86_64", + cmd: "echo '--flags ENABLE_ARM_CFI_TABLE=\"false\" IOS_STACK_PROFILER_ENABLED=\"true\" USE_ANDROID_UNWINDER_V2=\"true\"' | " + + "$(location build/write_buildflag_header.py) --output " + + "$(out) " + + "--rulename " + + "//base:profiler_buildflags " + + "--gen-dir " + + ". " + + "--definitions " + + "/dev/stdin", + out: [ + "base/profiler/profiler_buildflags.h", + ], + tool_files: [ + "build/write_buildflag_header.py", + ], +} + +// GN: //base:profiler_buildflags__host +genrule { + name: "cronet_aml_base_profiler_buildflags__host", + cmd: "echo '--flags ENABLE_ARM_CFI_TABLE=\"false\" IOS_STACK_PROFILER_ENABLED=\"true\" USE_ANDROID_UNWINDER_V2=\"true\"' | " + + "$(location build/write_buildflag_header.py) --output " + + "$(out) " + + "--rulename " + + "//base:profiler_buildflags " + + "--gen-dir " + + ". " + + "--definitions " + + "/dev/stdin", + out: [ + "base/profiler/profiler_buildflags.h", + ], + tool_files: [ + "build/write_buildflag_header.py", + ], +} + +// GN: //base:sanitizer_buildflags__android_x86 +genrule { + name: "cronet_aml_base_sanitizer_buildflags__android_x86", cmd: "echo '--flags IS_HWASAN=\"false\" USING_SANITIZER=\"false\"' | " + "$(location build/write_buildflag_header.py) --output " + "$(out) " + @@ -1729,9 +2909,89 @@ genrule { ], } -// GN: //base:synchronization_buildflags +// GN: //base:sanitizer_buildflags__android_x86_64 genrule { - name: "cronet_aml_base_synchronization_buildflags", + name: "cronet_aml_base_sanitizer_buildflags__android_x86_64", + cmd: "echo '--flags IS_HWASAN=\"false\" USING_SANITIZER=\"false\"' | " + + "$(location build/write_buildflag_header.py) --output " + + "$(out) " + + "--rulename " + + "//base:sanitizer_buildflags " + + "--gen-dir " + + ". " + + "--definitions " + + "/dev/stdin", + out: [ + "base/sanitizer_buildflags.h", + ], + tool_files: [ + "build/write_buildflag_header.py", + ], +} + +// GN: //base:sanitizer_buildflags__host +genrule { + name: "cronet_aml_base_sanitizer_buildflags__host", + cmd: "echo '--flags IS_HWASAN=\"false\" USING_SANITIZER=\"false\"' | " + + "$(location build/write_buildflag_header.py) --output " + + "$(out) " + + "--rulename " + + "//base:sanitizer_buildflags " + + "--gen-dir " + + ". " + + "--definitions " + + "/dev/stdin", + out: [ + "base/sanitizer_buildflags.h", + ], + tool_files: [ + "build/write_buildflag_header.py", + ], +} + +// GN: //base:synchronization_buildflags__android_x86 +genrule { + name: "cronet_aml_base_synchronization_buildflags__android_x86", + cmd: "echo '--flags ENABLE_MUTEX_PRIORITY_INHERITANCE=\"false\"' | " + + "$(location build/write_buildflag_header.py) --output " + + "$(out) " + + "--rulename " + + "//base:synchronization_buildflags " + + "--gen-dir " + + ". " + + "--definitions " + + "/dev/stdin", + out: [ + "base/synchronization/synchronization_buildflags.h", + ], + tool_files: [ + "build/write_buildflag_header.py", + ], +} + +// GN: //base:synchronization_buildflags__android_x86_64 +genrule { + name: "cronet_aml_base_synchronization_buildflags__android_x86_64", + cmd: "echo '--flags ENABLE_MUTEX_PRIORITY_INHERITANCE=\"false\"' | " + + "$(location build/write_buildflag_header.py) --output " + + "$(out) " + + "--rulename " + + "//base:synchronization_buildflags " + + "--gen-dir " + + ". " + + "--definitions " + + "/dev/stdin", + out: [ + "base/synchronization/synchronization_buildflags.h", + ], + tool_files: [ + "build/write_buildflag_header.py", + ], +} + +// GN: //base:synchronization_buildflags__host +genrule { + name: "cronet_aml_base_synchronization_buildflags__host", cmd: "echo '--flags ENABLE_MUTEX_PRIORITY_INHERITANCE=\"false\"' | " + "$(location build/write_buildflag_header.py) --output " + "$(out) " + @@ -2002,9 +3262,9 @@ cc_library_static { cpp_std: "c++20", } -// GN: //base:tracing_buildflags +// GN: //base:tracing_buildflags__android_x86 genrule { - name: "cronet_aml_base_tracing_buildflags", + name: "cronet_aml_base_tracing_buildflags__android_x86", cmd: "echo '--flags ENABLE_BASE_TRACING=\"false\" USE_PERFETTO_CLIENT_LIBRARY=\"false\" OPTIONAL_TRACE_EVENTS_ENABLED=\"false\"' | " + "$(location build/write_buildflag_header.py) --output " + "$(out) " + @@ -2022,9 +3282,89 @@ genrule { ], } -// GN: //build:branding_buildflags +// GN: //base:tracing_buildflags__android_x86_64 genrule { - name: "cronet_aml_build_branding_buildflags", + name: "cronet_aml_base_tracing_buildflags__android_x86_64", + cmd: "echo '--flags ENABLE_BASE_TRACING=\"false\" USE_PERFETTO_CLIENT_LIBRARY=\"false\" OPTIONAL_TRACE_EVENTS_ENABLED=\"false\"' | " + + "$(location build/write_buildflag_header.py) --output " + + "$(out) " + + "--rulename " + + "//base:tracing_buildflags " + + "--gen-dir " + + ". " + + "--definitions " + + "/dev/stdin", + out: [ + "base/tracing_buildflags.h", + ], + tool_files: [ + "build/write_buildflag_header.py", + ], +} + +// GN: //base:tracing_buildflags__host +genrule { + name: "cronet_aml_base_tracing_buildflags__host", + cmd: "echo '--flags ENABLE_BASE_TRACING=\"false\" USE_PERFETTO_CLIENT_LIBRARY=\"false\" OPTIONAL_TRACE_EVENTS_ENABLED=\"true\"' | " + + "$(location build/write_buildflag_header.py) --output " + + "$(out) " + + "--rulename " + + "//base:tracing_buildflags " + + "--gen-dir " + + ". " + + "--definitions " + + "/dev/stdin", + out: [ + "base/tracing_buildflags.h", + ], + tool_files: [ + "build/write_buildflag_header.py", + ], +} + +// GN: //build:branding_buildflags__android_x86 +genrule { + name: "cronet_aml_build_branding_buildflags__android_x86", + cmd: "echo '--flags CHROMIUM_BRANDING=\"1\" GOOGLE_CHROME_BRANDING=\"0\"' | " + + "$(location build/write_buildflag_header.py) --output " + + "$(out) " + + "--rulename " + + "//build:branding_buildflags " + + "--gen-dir " + + ". " + + "--definitions " + + "/dev/stdin", + out: [ + "build/branding_buildflags.h", + ], + tool_files: [ + "build/write_buildflag_header.py", + ], +} + +// GN: //build:branding_buildflags__android_x86_64 +genrule { + name: "cronet_aml_build_branding_buildflags__android_x86_64", + cmd: "echo '--flags CHROMIUM_BRANDING=\"1\" GOOGLE_CHROME_BRANDING=\"0\"' | " + + "$(location build/write_buildflag_header.py) --output " + + "$(out) " + + "--rulename " + + "//build:branding_buildflags " + + "--gen-dir " + + ". " + + "--definitions " + + "/dev/stdin", + out: [ + "build/branding_buildflags.h", + ], + tool_files: [ + "build/write_buildflag_header.py", + ], +} + +// GN: //build:branding_buildflags__host +genrule { + name: "cronet_aml_build_branding_buildflags__host", cmd: "echo '--flags CHROMIUM_BRANDING=\"1\" GOOGLE_CHROME_BRANDING=\"0\"' | " + "$(location build/write_buildflag_header.py) --output " + "$(out) " + @@ -2047,9 +3387,9 @@ cc_defaults { name: "cronet_aml_build_buildflag_header_h", } -// GN: //build:chromecast_buildflags +// GN: //build:chromecast_buildflags__android_x86 genrule { - name: "cronet_aml_build_chromecast_buildflags", + name: "cronet_aml_build_chromecast_buildflags__android_x86", cmd: "echo '--flags IS_CASTOS=\"false\" IS_CAST_ANDROID=\"false\" ENABLE_CAST_RECEIVER=\"false\" IS_CHROMECAST=\"false\"' | " + "$(location build/write_buildflag_header.py) --output " + "$(out) " + @@ -2067,9 +3407,49 @@ genrule { ], } -// GN: //build:chromeos_buildflags +// GN: //build:chromecast_buildflags__android_x86_64 genrule { - name: "cronet_aml_build_chromeos_buildflags", + name: "cronet_aml_build_chromecast_buildflags__android_x86_64", + cmd: "echo '--flags IS_CASTOS=\"false\" IS_CAST_ANDROID=\"false\" ENABLE_CAST_RECEIVER=\"false\" IS_CHROMECAST=\"false\"' | " + + "$(location build/write_buildflag_header.py) --output " + + "$(out) " + + "--rulename " + + "//build:chromecast_buildflags " + + "--gen-dir " + + ". " + + "--definitions " + + "/dev/stdin", + out: [ + "build/chromecast_buildflags.h", + ], + tool_files: [ + "build/write_buildflag_header.py", + ], +} + +// GN: //build:chromecast_buildflags__host +genrule { + name: "cronet_aml_build_chromecast_buildflags__host", + cmd: "echo '--flags IS_CASTOS=\"false\" IS_CAST_ANDROID=\"false\" ENABLE_CAST_RECEIVER=\"false\" IS_CHROMECAST=\"false\"' | " + + "$(location build/write_buildflag_header.py) --output " + + "$(out) " + + "--rulename " + + "//build:chromecast_buildflags " + + "--gen-dir " + + ". " + + "--definitions " + + "/dev/stdin", + out: [ + "build/chromecast_buildflags.h", + ], + tool_files: [ + "build/write_buildflag_header.py", + ], +} + +// GN: //build:chromeos_buildflags__android_x86 +genrule { + name: "cronet_aml_build_chromeos_buildflags__android_x86", cmd: "echo '--flags IS_CHROMEOS_DEVICE=\"false\" IS_CHROMEOS_LACROS=\"false\" IS_CHROMEOS_ASH=\"false\" IS_CHROMEOS_WITH_HW_DETAILS=\"false\" IS_REVEN=\"false\"' | " + "$(location build/write_buildflag_header.py) --output " + "$(out) " + @@ -2087,9 +3467,49 @@ genrule { ], } -// GN: //build/config/compiler:compiler_buildflags +// GN: //build:chromeos_buildflags__android_x86_64 genrule { - name: "cronet_aml_build_config_compiler_compiler_buildflags", + name: "cronet_aml_build_chromeos_buildflags__android_x86_64", + cmd: "echo '--flags IS_CHROMEOS_DEVICE=\"false\" IS_CHROMEOS_LACROS=\"false\" IS_CHROMEOS_ASH=\"false\" IS_CHROMEOS_WITH_HW_DETAILS=\"false\" IS_REVEN=\"false\"' | " + + "$(location build/write_buildflag_header.py) --output " + + "$(out) " + + "--rulename " + + "//build:chromeos_buildflags " + + "--gen-dir " + + ". " + + "--definitions " + + "/dev/stdin", + out: [ + "build/chromeos_buildflags.h", + ], + tool_files: [ + "build/write_buildflag_header.py", + ], +} + +// GN: //build:chromeos_buildflags__host +genrule { + name: "cronet_aml_build_chromeos_buildflags__host", + cmd: "echo '--flags IS_CHROMEOS_DEVICE=\"false\" IS_CHROMEOS_LACROS=\"false\" IS_CHROMEOS_ASH=\"false\" IS_CHROMEOS_WITH_HW_DETAILS=\"false\" IS_REVEN=\"false\"' | " + + "$(location build/write_buildflag_header.py) --output " + + "$(out) " + + "--rulename " + + "//build:chromeos_buildflags " + + "--gen-dir " + + ". " + + "--definitions " + + "/dev/stdin", + out: [ + "build/chromeos_buildflags.h", + ], + tool_files: [ + "build/write_buildflag_header.py", + ], +} + +// GN: //build/config/compiler:compiler_buildflags__android_x86 +genrule { + name: "cronet_aml_build_config_compiler_compiler_buildflags__android_x86", cmd: "echo '--flags CLANG_PGO=\"0\" SYMBOL_LEVEL=\"1\"' | " + "$(location build/write_buildflag_header.py) --output " + "$(out) " + @@ -2107,6 +3527,46 @@ genrule { ], } +// GN: //build/config/compiler:compiler_buildflags__android_x86_64 +genrule { + name: "cronet_aml_build_config_compiler_compiler_buildflags__android_x86_64", + cmd: "echo '--flags CLANG_PGO=\"0\" SYMBOL_LEVEL=\"1\"' | " + + "$(location build/write_buildflag_header.py) --output " + + "$(out) " + + "--rulename " + + "//build/config/compiler:compiler_buildflags " + + "--gen-dir " + + ". " + + "--definitions " + + "/dev/stdin", + out: [ + "build/config/compiler/compiler_buildflags.h", + ], + tool_files: [ + "build/write_buildflag_header.py", + ], +} + +// GN: //build/config/compiler:compiler_buildflags__host +genrule { + name: "cronet_aml_build_config_compiler_compiler_buildflags__host", + cmd: "echo '--flags CLANG_PGO=\"0\" SYMBOL_LEVEL=\"2\"' | " + + "$(location build/write_buildflag_header.py) --output " + + "$(out) " + + "--rulename " + + "//build/config/compiler:compiler_buildflags " + + "--gen-dir " + + ". " + + "--definitions " + + "/dev/stdin", + out: [ + "build/config/compiler/compiler_buildflags.h", + ], + tool_files: [ + "build/write_buildflag_header.py", + ], +} + // GN: //buildtools/third_party/libc++:libc++ cc_defaults { name: "cronet_aml_buildtools_third_party_libc___libc__", @@ -2351,9 +3811,29 @@ cc_defaults { }, } -// GN: //components/cronet/android:buildflags +// GN: //components/cronet/android:buildflags__android_x86 genrule { - name: "cronet_aml_components_cronet_android_buildflags", + name: "cronet_aml_components_cronet_android_buildflags__android_x86", + cmd: "echo '--flags INTEGRATED_MODE=\"false\"' | " + + "$(location build/write_buildflag_header.py) --output " + + "$(out) " + + "--rulename " + + "//components/cronet/android:buildflags " + + "--gen-dir " + + ". " + + "--definitions " + + "/dev/stdin", + out: [ + "components/cronet/android/buildflags.h", + ], + tool_files: [ + "build/write_buildflag_header.py", + ], +} + +// GN: //components/cronet/android:buildflags__android_x86_64 +genrule { + name: "cronet_aml_components_cronet_android_buildflags__android_x86_64", cmd: "echo '--flags INTEGRATED_MODE=\"false\"' | " + "$(location build/write_buildflag_header.py) --output " + "$(out) " + @@ -2407,16 +3887,25 @@ cc_library_shared { "cronet_aml_url_url", ], generated_headers: [ - "cronet_aml_base_debugging_buildflags", - "cronet_aml_base_logging_buildflags", - "cronet_aml_build_chromeos_buildflags", - "cronet_aml_components_cronet_android_buildflags", - "cronet_aml_components_cronet_android_cronet_jni_headers", - "cronet_aml_components_cronet_android_cronet_jni_registration", - "cronet_aml_components_cronet_cronet_buildflags", - "cronet_aml_components_cronet_cronet_version_header_action", + "cronet_aml_base_debugging_buildflags__android_x86", + "cronet_aml_base_debugging_buildflags__android_x86_64", + "cronet_aml_base_logging_buildflags__android_x86", + "cronet_aml_base_logging_buildflags__android_x86_64", + "cronet_aml_build_chromeos_buildflags__android_x86", + "cronet_aml_build_chromeos_buildflags__android_x86_64", + "cronet_aml_components_cronet_android_buildflags__android_x86", + "cronet_aml_components_cronet_android_buildflags__android_x86_64", + "cronet_aml_components_cronet_android_cronet_jni_headers__android_x86", + "cronet_aml_components_cronet_android_cronet_jni_headers__android_x86_64", + "cronet_aml_components_cronet_android_cronet_jni_registration__android_x86", + "cronet_aml_components_cronet_android_cronet_jni_registration__android_x86_64", + "cronet_aml_components_cronet_cronet_buildflags__android_x86", + "cronet_aml_components_cronet_cronet_buildflags__android_x86_64", + "cronet_aml_components_cronet_cronet_version_header_action__android_x86", + "cronet_aml_components_cronet_cronet_version_header_action__android_x86_64", "cronet_aml_third_party_metrics_proto_metrics_proto_gen_headers", - "cronet_aml_url_buildflags", + "cronet_aml_url_buildflags__android_x86", + "cronet_aml_url_buildflags__android_x86_64", ], defaults: [ "cronet_aml_buildtools_third_party_libc___libc__", @@ -2489,9 +3978,9 @@ cc_library_shared { rtti: true, } -// GN: //components/cronet/android:cronet_jni_headers +// GN: //components/cronet/android:cronet_jni_headers__android_x86 genrule { - name: "cronet_aml_components_cronet_android_cronet_jni_headers", + name: "cronet_aml_components_cronet_android_cronet_jni_headers__android_x86", srcs: [ "components/cronet/android/java/src/org/chromium/net/impl/CronetBidirectionalStream.java", "components/cronet/android/java/src/org/chromium/net/impl/CronetLibraryLoader.java", @@ -2544,32 +4033,105 @@ genrule { ], } -// GN: //components/cronet/android:cronet_jni_registration +// GN: //components/cronet/android:cronet_jni_headers__android_x86_64 genrule { - name: "cronet_aml_components_cronet_android_cronet_jni_registration", + name: "cronet_aml_components_cronet_android_cronet_jni_headers__android_x86_64", + srcs: [ + "components/cronet/android/java/src/org/chromium/net/impl/CronetBidirectionalStream.java", + "components/cronet/android/java/src/org/chromium/net/impl/CronetLibraryLoader.java", + "components/cronet/android/java/src/org/chromium/net/impl/CronetUploadDataStream.java", + "components/cronet/android/java/src/org/chromium/net/impl/CronetUrlRequest.java", + "components/cronet/android/java/src/org/chromium/net/impl/CronetUrlRequestContext.java", + ], + cmd: "$(location base/android/jni_generator/jni_generator.py) --ptr_type " + + "long " + + " " + + " " + + "--output_dir " + + "$(genDir)/components/cronet/android/cronet_jni_headers " + + "--includes " + + "base/android/jni_generator/jni_generator_helper.h " + + "--use_proxy_hash " + + "--output_name " + + "CronetBidirectionalStream_jni.h " + + "--output_name " + + "CronetLibraryLoader_jni.h " + + "--output_name " + + "CronetUploadDataStream_jni.h " + + "--output_name " + + "CronetUrlRequest_jni.h " + + "--output_name " + + "CronetUrlRequestContext_jni.h " + + "--input_file " + + "$(location components/cronet/android/java/src/org/chromium/net/impl/CronetBidirectionalStream.java) " + + "--input_file " + + "$(location components/cronet/android/java/src/org/chromium/net/impl/CronetLibraryLoader.java) " + + "--input_file " + + "$(location components/cronet/android/java/src/org/chromium/net/impl/CronetUploadDataStream.java) " + + "--input_file " + + "$(location components/cronet/android/java/src/org/chromium/net/impl/CronetUrlRequest.java) " + + "--input_file " + + "$(location components/cronet/android/java/src/org/chromium/net/impl/CronetUrlRequestContext.java)", + out: [ + "components/cronet/android/cronet_jni_headers/CronetBidirectionalStream_jni.h", + "components/cronet/android/cronet_jni_headers/CronetLibraryLoader_jni.h", + "components/cronet/android/cronet_jni_headers/CronetUploadDataStream_jni.h", + "components/cronet/android/cronet_jni_headers/CronetUrlRequestContext_jni.h", + "components/cronet/android/cronet_jni_headers/CronetUrlRequest_jni.h", + ], + tool_files: [ + "base/android/jni_generator/android_jar.classes", + "base/android/jni_generator/jni_generator.py", + "build/android/gyp/util/__init__.py", + "build/android/gyp/util/build_utils.py", + "build/gn_helpers.py", + ], +} + +// GN: //components/cronet/android:cronet_jni_registration__android_x86 +genrule { + name: "cronet_aml_components_cronet_android_cronet_jni_registration__android_x86", + srcs: [ + "components/cronet/android/java/src/org/chromium/net/impl/CronetUrlRequest.java", + ], + cmd: "current_dir=`basename \\`pwd\\``; " + + "for f in $(in); " + + "do " + + "echo \"../$$current_dir/$$f\" >> $(genDir)/java.sources; " + + "done; " + + "python3 $(location base/android/jni_generator/jni_registration_generator.py) --srcjar-path " + + "$(genDir)/components/cronet/android/cronet_jni_registration.srcjar " + + "--depfile " + + "$(genDir)/components/cronet/android/cronet_jni_registration.d " + + "--sources-files " + + "$(genDir)/java.sources " + + "--include_test_only " + + "--use_proxy_hash " + + "--header-path " + + "$(genDir)/components/cronet/android/cronet_jni_registration.h " + + "--manual_jni_registration " + + " " + + " " + + ";sed -i -e 's/OUT_SOONG_.TEMP_SBOX_.*_OUT/GEN/g' " + + "$(genDir)/components/cronet/android/cronet_jni_registration.h", + out: [ + "components/cronet/android/cronet_jni_registration.h", + "components/cronet/android/cronet_jni_registration.srcjar", + ], + tool_files: [ + "base/android/jni_generator/jni_generator.py", + "base/android/jni_generator/jni_registration_generator.py", + "build/android/gyp/util/__init__.py", + "build/android/gyp/util/build_utils.py", + "build/gn_helpers.py", + ], +} + +// GN: //components/cronet/android:cronet_jni_registration__android_x86_64 +genrule { + name: "cronet_aml_components_cronet_android_cronet_jni_registration__android_x86_64", srcs: [ - "base/android/java/src/org/chromium/base/JniException.java", - "base/android/java/src/org/chromium/base/JniStaticTestMocker.java", - "base/android/java/src/org/chromium/base/NativeLibraryLoadedStatus.java", - "base/android/java/src/org/chromium/base/annotations/AccessedByNative.java", - "base/android/java/src/org/chromium/base/annotations/CalledByNative.java", - "base/android/java/src/org/chromium/base/annotations/CalledByNativeForTesting.java", - "base/android/java/src/org/chromium/base/annotations/CalledByNativeUnchecked.java", - "base/android/java/src/org/chromium/base/annotations/JNIAdditionalImport.java", - "base/android/java/src/org/chromium/base/annotations/JNINamespace.java", - "base/android/java/src/org/chromium/base/annotations/JniIgnoreNatives.java", - "base/android/java/src/org/chromium/base/annotations/NativeClassQualifiedName.java", - "base/android/java/src/org/chromium/base/annotations/NativeMethods.java", - "build/android/java/src/org/chromium/build/annotations/AlwaysInline.java", - "build/android/java/src/org/chromium/build/annotations/CheckDiscard.java", - "build/android/java/src/org/chromium/build/annotations/DoNotClassMerge.java", - "build/android/java/src/org/chromium/build/annotations/DoNotInline.java", - "build/android/java/src/org/chromium/build/annotations/IdentifierNameString.java", - "build/android/java/src/org/chromium/build/annotations/MainDex.java", - "build/android/java/src/org/chromium/build/annotations/MockedInTests.java", - "build/android/java/src/org/chromium/build/annotations/UsedByReflection.java", "components/cronet/android/java/src/org/chromium/net/impl/CronetUrlRequest.java", - "url/android/java/src/org/chromium/url/IDNStringUtil.java", ], cmd: "current_dir=`basename \\`pwd\\``; " + "for f in $(in); " + @@ -2679,9 +4241,29 @@ cc_defaults { }, } -// GN: //components/cronet:cronet_buildflags +// GN: //components/cronet:cronet_buildflags__android_x86 genrule { - name: "cronet_aml_components_cronet_cronet_buildflags", + name: "cronet_aml_components_cronet_cronet_buildflags__android_x86", + cmd: "echo '--flags DISABLE_HISTOGRAM_SUPPORT=\"false\"' | " + + "$(location build/write_buildflag_header.py) --output " + + "$(out) " + + "--rulename " + + "//components/cronet:cronet_buildflags " + + "--gen-dir " + + ". " + + "--definitions " + + "/dev/stdin", + out: [ + "components/cronet/cronet_buildflags.h", + ], + tool_files: [ + "build/write_buildflag_header.py", + ], +} + +// GN: //components/cronet:cronet_buildflags__android_x86_64 +genrule { + name: "cronet_aml_components_cronet_cronet_buildflags__android_x86_64", cmd: "echo '--flags DISABLE_HISTOGRAM_SUPPORT=\"false\"' | " + "$(location build/write_buildflag_header.py) --output " + "$(out) " + @@ -2779,9 +4361,32 @@ cc_defaults { name: "cronet_aml_components_cronet_cronet_version_header", } -// GN: //components/cronet:cronet_version_header_action +// GN: //components/cronet:cronet_version_header_action__android_x86 genrule { - name: "cronet_aml_components_cronet_cronet_version_header_action", + name: "cronet_aml_components_cronet_cronet_version_header_action__android_x86", + cmd: "$(location build/util/version.py) -f " + + "$(location chrome/VERSION) " + + "-e " + + "VERSION_FULL='\"%s.%s.%s.%s\" % (MAJOR,MINOR,BUILD,PATCH)' " + + " " + + "-o " + + "$(out) " + + "$(location components/cronet/version.h.in)", + out: [ + "components/cronet/version.h", + ], + tool_files: [ + "build/util/LASTCHANGE", + "build/util/android_chrome_version.py", + "build/util/version.py", + "chrome/VERSION", + "components/cronet/version.h.in", + ], +} + +// GN: //components/cronet:cronet_version_header_action__android_x86_64 +genrule { + name: "cronet_aml_components_cronet_cronet_version_header_action__android_x86_64", cmd: "$(location build/util/version.py) -f " + "$(location chrome/VERSION) " + "-e " + @@ -3070,9 +4675,9 @@ cc_defaults { }, } -// GN: //components/nacl/common:buildflags +// GN: //components/nacl/common:buildflags__host genrule { - name: "cronet_aml_components_nacl_common_buildflags", + name: "cronet_aml_components_nacl_common_buildflags__host", cmd: "echo '--flags ENABLE_NACL=\"true\" IS_MINIMAL_TOOLCHAIN=\"false\"' | " + "$(location build/write_buildflag_header.py) --output " + "$(out) " + @@ -3090,9 +4695,40 @@ genrule { ], } -// GN: //components/prefs/android:jni_headers +// GN: //components/prefs/android:jni_headers__android_x86 genrule { - name: "cronet_aml_components_prefs_android_jni_headers", + name: "cronet_aml_components_prefs_android_jni_headers__android_x86", + srcs: [ + "components/prefs/android/java/src/org/chromium/components/prefs/PrefService.java", + ], + cmd: "$(location base/android/jni_generator/jni_generator.py) --ptr_type " + + "long " + + " " + + " " + + "--output_dir " + + "$(genDir)/components/prefs/android/jni_headers " + + "--includes " + + "base/android/jni_generator/jni_generator_helper.h " + + "--use_proxy_hash " + + "--output_name " + + "PrefService_jni.h " + + "--input_file " + + "$(location components/prefs/android/java/src/org/chromium/components/prefs/PrefService.java)", + out: [ + "components/prefs/android/jni_headers/PrefService_jni.h", + ], + tool_files: [ + "base/android/jni_generator/android_jar.classes", + "base/android/jni_generator/jni_generator.py", + "build/android/gyp/util/__init__.py", + "build/android/gyp/util/build_utils.py", + "build/gn_helpers.py", + ], +} + +// GN: //components/prefs/android:jni_headers__android_x86_64 +genrule { + name: "cronet_aml_components_prefs_android_jni_headers__android_x86_64", srcs: [ "components/prefs/android/java/src/org/chromium/components/prefs/PrefService.java", ], @@ -3164,16 +4800,24 @@ cc_library_static { "cronet_aml_third_party_modp_b64_modp_b64", ], generated_headers: [ - "cronet_aml_base_debugging_buildflags", - "cronet_aml_base_logging_buildflags", - "cronet_aml_build_chromeos_buildflags", - "cronet_aml_components_prefs_android_jni_headers", + "cronet_aml_base_debugging_buildflags__android_x86", + "cronet_aml_base_debugging_buildflags__android_x86_64", + "cronet_aml_base_logging_buildflags__android_x86", + "cronet_aml_base_logging_buildflags__android_x86_64", + "cronet_aml_build_chromeos_buildflags__android_x86", + "cronet_aml_build_chromeos_buildflags__android_x86_64", + "cronet_aml_components_prefs_android_jni_headers__android_x86", + "cronet_aml_components_prefs_android_jni_headers__android_x86_64", ], export_generated_headers: [ - "cronet_aml_base_debugging_buildflags", - "cronet_aml_base_logging_buildflags", - "cronet_aml_build_chromeos_buildflags", - "cronet_aml_components_prefs_android_jni_headers", + "cronet_aml_base_debugging_buildflags__android_x86", + "cronet_aml_base_debugging_buildflags__android_x86_64", + "cronet_aml_base_logging_buildflags__android_x86", + "cronet_aml_base_logging_buildflags__android_x86_64", + "cronet_aml_build_chromeos_buildflags__android_x86", + "cronet_aml_build_chromeos_buildflags__android_x86_64", + "cronet_aml_components_prefs_android_jni_headers__android_x86", + "cronet_aml_components_prefs_android_jni_headers__android_x86_64", ], defaults: [ "cronet_aml_defaults", @@ -3207,9 +4851,9 @@ cc_library_static { cpp_std: "c++20", } -// GN: //crypto:buildflags +// GN: //crypto:buildflags__android_x86 genrule { - name: "cronet_aml_crypto_buildflags", + name: "cronet_aml_crypto_buildflags__android_x86", cmd: "echo '--flags USE_NSS_CERTS=\"false\"' | " + "$(location build/write_buildflag_header.py) --output " + "$(out) " + @@ -3227,6 +4871,46 @@ genrule { ], } +// GN: //crypto:buildflags__android_x86_64 +genrule { + name: "cronet_aml_crypto_buildflags__android_x86_64", + cmd: "echo '--flags USE_NSS_CERTS=\"false\"' | " + + "$(location build/write_buildflag_header.py) --output " + + "$(out) " + + "--rulename " + + "//crypto:buildflags " + + "--gen-dir " + + ". " + + "--definitions " + + "/dev/stdin", + out: [ + "crypto/crypto_buildflags.h", + ], + tool_files: [ + "build/write_buildflag_header.py", + ], +} + +// GN: //crypto:buildflags__host +genrule { + name: "cronet_aml_crypto_buildflags__host", + cmd: "echo '--flags USE_NSS_CERTS=\"true\"' | " + + "$(location build/write_buildflag_header.py) --output " + + "$(out) " + + "--rulename " + + "//crypto:buildflags " + + "--gen-dir " + + ". " + + "--definitions " + + "/dev/stdin", + out: [ + "crypto/crypto_buildflags.h", + ], + tool_files: [ + "build/write_buildflag_header.py", + ], +} + // GN: //crypto:crypto cc_library_static { name: "cronet_aml_crypto_crypto", @@ -3265,14 +4949,18 @@ cc_library_static { ], host_supported: true, generated_headers: [ - "cronet_aml_build_chromeos_buildflags", - "cronet_aml_components_nacl_common_buildflags", - "cronet_aml_crypto_buildflags", + "cronet_aml_build_chromeos_buildflags__host", + "cronet_aml_components_nacl_common_buildflags__host", + "cronet_aml_crypto_buildflags__android_x86", + "cronet_aml_crypto_buildflags__android_x86_64", + "cronet_aml_crypto_buildflags__host", ], export_generated_headers: [ - "cronet_aml_build_chromeos_buildflags", - "cronet_aml_components_nacl_common_buildflags", - "cronet_aml_crypto_buildflags", + "cronet_aml_build_chromeos_buildflags__host", + "cronet_aml_components_nacl_common_buildflags__host", + "cronet_aml_crypto_buildflags__android_x86", + "cronet_aml_crypto_buildflags__android_x86_64", + "cronet_aml_crypto_buildflags__host", ], defaults: [ "cronet_aml_defaults", @@ -3391,29 +5079,6 @@ cc_defaults { // GN: //gn:java java_library { name: "cronet_aml_java", - srcs: [ - "base/android/java/src/org/chromium/base/JniException.java", - "base/android/java/src/org/chromium/base/JniStaticTestMocker.java", - "base/android/java/src/org/chromium/base/NativeLibraryLoadedStatus.java", - "base/android/java/src/org/chromium/base/annotations/AccessedByNative.java", - "base/android/java/src/org/chromium/base/annotations/CalledByNative.java", - "base/android/java/src/org/chromium/base/annotations/CalledByNativeForTesting.java", - "base/android/java/src/org/chromium/base/annotations/CalledByNativeUnchecked.java", - "base/android/java/src/org/chromium/base/annotations/JNIAdditionalImport.java", - "base/android/java/src/org/chromium/base/annotations/JNINamespace.java", - "base/android/java/src/org/chromium/base/annotations/JniIgnoreNatives.java", - "base/android/java/src/org/chromium/base/annotations/NativeClassQualifiedName.java", - "base/android/java/src/org/chromium/base/annotations/NativeMethods.java", - "build/android/java/src/org/chromium/build/annotations/AlwaysInline.java", - "build/android/java/src/org/chromium/build/annotations/CheckDiscard.java", - "build/android/java/src/org/chromium/build/annotations/DoNotClassMerge.java", - "build/android/java/src/org/chromium/build/annotations/DoNotInline.java", - "build/android/java/src/org/chromium/build/annotations/IdentifierNameString.java", - "build/android/java/src/org/chromium/build/annotations/MainDex.java", - "build/android/java/src/org/chromium/build/annotations/MockedInTests.java", - "build/android/java/src/org/chromium/build/annotations/UsedByReflection.java", - "url/android/java/src/org/chromium/url/IDNStringUtil.java", - ], } // GN: //net/base/registry_controlled_domains:registry_controlled_domains @@ -3467,9 +5132,9 @@ genrule { ], } -// GN: //net:buildflags +// GN: //net:buildflags__android_x86 genrule { - name: "cronet_aml_net_buildflags", + name: "cronet_aml_net_buildflags__android_x86", cmd: "echo '--flags POSIX_BYPASS_MMAP=\"false\" DISABLE_FILE_SUPPORT=\"true\" ENABLE_MDNS=\"false\" ENABLE_REPORTING=\"true\" ENABLE_WEBSOCKETS=\"false\" INCLUDE_TRANSPORT_SECURITY_STATE_PRELOAD_LIST=\"false\" USE_KERBEROS=\"true\" USE_EXTERNAL_GSSAPI=\"false\" TRIAL_COMPARISON_CERT_VERIFIER_SUPPORTED=\"false\" CHROME_ROOT_STORE_SUPPORTED=\"false\"' | " + "$(location build/write_buildflag_header.py) --output " + "$(out) " + @@ -3487,6 +5152,26 @@ genrule { ], } +// GN: //net:buildflags__android_x86_64 +genrule { + name: "cronet_aml_net_buildflags__android_x86_64", + cmd: "echo '--flags POSIX_BYPASS_MMAP=\"true\" DISABLE_FILE_SUPPORT=\"true\" ENABLE_MDNS=\"false\" ENABLE_REPORTING=\"true\" ENABLE_WEBSOCKETS=\"false\" INCLUDE_TRANSPORT_SECURITY_STATE_PRELOAD_LIST=\"false\" USE_KERBEROS=\"true\" USE_EXTERNAL_GSSAPI=\"false\" TRIAL_COMPARISON_CERT_VERIFIER_SUPPORTED=\"false\" CHROME_ROOT_STORE_SUPPORTED=\"false\"' | " + + "$(location build/write_buildflag_header.py) --output " + + "$(out) " + + "--rulename " + + "//net:buildflags " + + "--gen-dir " + + ". " + + "--definitions " + + "/dev/stdin", + out: [ + "net/net_buildflags.h", + ], + tool_files: [ + "build/write_buildflag_header.py", + ], +} + // GN: //net:constants cc_defaults { name: "cronet_aml_net_constants", @@ -3522,9 +5207,32 @@ cc_defaults { }, } -// GN: //net/data/ssl/chrome_root_store:gen_root_store_inc +// GN: //net/data/ssl/chrome_root_store:gen_root_store_inc__android_x86 genrule { - name: "cronet_aml_net_data_ssl_chrome_root_store_gen_root_store_inc", + name: "cronet_aml_net_data_ssl_chrome_root_store_gen_root_store_inc__android_x86", + cmd: "$(location build/gn_run_binary.py) clang_x64/root_store_tool " + + "--root-store " + + "../../net/data/ssl/chrome_root_store/root_store.textproto " + + "--certs " + + "../../net/data/ssl/chrome_root_store/root_store.certs " + + "--write-cpp-root-store " + + "gen/net/data/ssl/chrome_root_store/chrome-root-store-inc.cc " + + "--write-cpp-ev-roots " + + "gen/net/data/ssl/chrome_root_store/chrome-ev-roots-inc.cc", + out: [ + "net/data/ssl/chrome_root_store/chrome-ev-roots-inc.cc", + "net/data/ssl/chrome_root_store/chrome-root-store-inc.cc", + ], + tool_files: [ + "build/gn_run_binary.py", + "net/data/ssl/chrome_root_store/root_store.certs", + "net/data/ssl/chrome_root_store/root_store.textproto", + ], +} + +// GN: //net/data/ssl/chrome_root_store:gen_root_store_inc__android_x86_64 +genrule { + name: "cronet_aml_net_data_ssl_chrome_root_store_gen_root_store_inc__android_x86_64", cmd: "$(location build/gn_run_binary.py) clang_x64/root_store_tool " + "--root-store " + "../../net/data/ssl/chrome_root_store/root_store.textproto " + @@ -4020,9 +5728,29 @@ cc_defaults { }, } -// GN: //net:ios_cronet_buildflags +// GN: //net:ios_cronet_buildflags__android_x86 genrule { - name: "cronet_aml_net_ios_cronet_buildflags", + name: "cronet_aml_net_ios_cronet_buildflags__android_x86", + cmd: "echo '--flags CRONET_BUILD=\"false\"' | " + + "$(location build/write_buildflag_header.py) --output " + + "$(out) " + + "--rulename " + + "//net:ios_cronet_buildflags " + + "--gen-dir " + + ". " + + "--definitions " + + "/dev/stdin", + out: [ + "net/socket/ios_cronet_buildflags.h", + ], + tool_files: [ + "build/write_buildflag_header.py", + ], +} + +// GN: //net:ios_cronet_buildflags__android_x86_64 +genrule { + name: "cronet_aml_net_ios_cronet_buildflags__android_x86_64", cmd: "echo '--flags CRONET_BUILD=\"false\"' | " + "$(location build/write_buildflag_header.py) --output " + "$(out) " + @@ -4592,32 +6320,48 @@ cc_library_static { "cronet_aml_url_url", ], generated_headers: [ - "cronet_aml_base_debugging_buildflags", - "cronet_aml_base_logging_buildflags", - "cronet_aml_build_branding_buildflags", - "cronet_aml_build_chromeos_buildflags", + "cronet_aml_base_debugging_buildflags__android_x86", + "cronet_aml_base_debugging_buildflags__android_x86_64", + "cronet_aml_base_logging_buildflags__android_x86", + "cronet_aml_base_logging_buildflags__android_x86_64", + "cronet_aml_build_branding_buildflags__android_x86", + "cronet_aml_build_branding_buildflags__android_x86_64", + "cronet_aml_build_chromeos_buildflags__android_x86", + "cronet_aml_build_chromeos_buildflags__android_x86_64", "cronet_aml_net_base_registry_controlled_domains_registry_controlled_domains", - "cronet_aml_net_buildflags", - "cronet_aml_net_ios_cronet_buildflags", + "cronet_aml_net_buildflags__android_x86", + "cronet_aml_net_buildflags__android_x86_64", + "cronet_aml_net_ios_cronet_buildflags__android_x86", + "cronet_aml_net_ios_cronet_buildflags__android_x86_64", "cronet_aml_net_isolation_info_proto_gen_headers", - "cronet_aml_net_net_jni_headers", + "cronet_aml_net_net_jni_headers__android_x86", + "cronet_aml_net_net_jni_headers__android_x86_64", "cronet_aml_net_net_nqe_proto_gen_headers", "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen_headers", - "cronet_aml_url_buildflags", + "cronet_aml_url_buildflags__android_x86", + "cronet_aml_url_buildflags__android_x86_64", ], export_generated_headers: [ - "cronet_aml_base_debugging_buildflags", - "cronet_aml_base_logging_buildflags", - "cronet_aml_build_branding_buildflags", - "cronet_aml_build_chromeos_buildflags", + "cronet_aml_base_debugging_buildflags__android_x86", + "cronet_aml_base_debugging_buildflags__android_x86_64", + "cronet_aml_base_logging_buildflags__android_x86", + "cronet_aml_base_logging_buildflags__android_x86_64", + "cronet_aml_build_branding_buildflags__android_x86", + "cronet_aml_build_branding_buildflags__android_x86_64", + "cronet_aml_build_chromeos_buildflags__android_x86", + "cronet_aml_build_chromeos_buildflags__android_x86_64", "cronet_aml_net_base_registry_controlled_domains_registry_controlled_domains", - "cronet_aml_net_buildflags", - "cronet_aml_net_ios_cronet_buildflags", + "cronet_aml_net_buildflags__android_x86", + "cronet_aml_net_buildflags__android_x86_64", + "cronet_aml_net_ios_cronet_buildflags__android_x86", + "cronet_aml_net_ios_cronet_buildflags__android_x86_64", "cronet_aml_net_isolation_info_proto_gen_headers", - "cronet_aml_net_net_jni_headers", + "cronet_aml_net_net_jni_headers__android_x86", + "cronet_aml_net_net_jni_headers__android_x86_64", "cronet_aml_net_net_nqe_proto_gen_headers", "cronet_aml_net_third_party_quiche_net_quic_test_tools_proto_gen_headers", - "cronet_aml_url_buildflags", + "cronet_aml_url_buildflags__android_x86", + "cronet_aml_url_buildflags__android_x86_64", ], export_static_lib_headers: [ "cronet_aml_crypto_crypto", @@ -4741,9 +6485,112 @@ cc_defaults { name: "cronet_aml_net_net_export_header", } -// GN: //net:net_jni_headers +// GN: //net:net_jni_headers__android_x86 genrule { - name: "cronet_aml_net_net_jni_headers", + name: "cronet_aml_net_net_jni_headers__android_x86", + srcs: [ + "net/android/java/src/org/chromium/net/AndroidCertVerifyResult.java", + "net/android/java/src/org/chromium/net/AndroidKeyStore.java", + "net/android/java/src/org/chromium/net/AndroidNetworkLibrary.java", + "net/android/java/src/org/chromium/net/AndroidTrafficStats.java", + "net/android/java/src/org/chromium/net/DnsStatus.java", + "net/android/java/src/org/chromium/net/GURLUtils.java", + "net/android/java/src/org/chromium/net/HttpNegotiateAuthenticator.java", + "net/android/java/src/org/chromium/net/HttpUtil.java", + "net/android/java/src/org/chromium/net/NetStringUtil.java", + "net/android/java/src/org/chromium/net/NetworkActiveNotifier.java", + "net/android/java/src/org/chromium/net/NetworkChangeNotifier.java", + "net/android/java/src/org/chromium/net/ProxyChangeListener.java", + "net/android/java/src/org/chromium/net/X509Util.java", + ], + cmd: "$(location base/android/jni_generator/jni_generator.py) --ptr_type " + + "long " + + " " + + " " + + "--output_dir " + + "$(genDir)/net/net_jni_headers " + + "--includes " + + "base/android/jni_generator/jni_generator_helper.h " + + "--use_proxy_hash " + + "--output_name " + + "AndroidCertVerifyResult_jni.h " + + "--output_name " + + "AndroidKeyStore_jni.h " + + "--output_name " + + "AndroidNetworkLibrary_jni.h " + + "--output_name " + + "AndroidTrafficStats_jni.h " + + "--output_name " + + "DnsStatus_jni.h " + + "--output_name " + + "GURLUtils_jni.h " + + "--output_name " + + "HttpNegotiateAuthenticator_jni.h " + + "--output_name " + + "HttpUtil_jni.h " + + "--output_name " + + "NetStringUtil_jni.h " + + "--output_name " + + "NetworkActiveNotifier_jni.h " + + "--output_name " + + "NetworkChangeNotifier_jni.h " + + "--output_name " + + "ProxyChangeListener_jni.h " + + "--output_name " + + "X509Util_jni.h " + + "--input_file " + + "$(location net/android/java/src/org/chromium/net/AndroidCertVerifyResult.java) " + + "--input_file " + + "$(location net/android/java/src/org/chromium/net/AndroidKeyStore.java) " + + "--input_file " + + "$(location net/android/java/src/org/chromium/net/AndroidNetworkLibrary.java) " + + "--input_file " + + "$(location net/android/java/src/org/chromium/net/AndroidTrafficStats.java) " + + "--input_file " + + "$(location net/android/java/src/org/chromium/net/DnsStatus.java) " + + "--input_file " + + "$(location net/android/java/src/org/chromium/net/GURLUtils.java) " + + "--input_file " + + "$(location net/android/java/src/org/chromium/net/HttpNegotiateAuthenticator.java) " + + "--input_file " + + "$(location net/android/java/src/org/chromium/net/HttpUtil.java) " + + "--input_file " + + "$(location net/android/java/src/org/chromium/net/NetStringUtil.java) " + + "--input_file " + + "$(location net/android/java/src/org/chromium/net/NetworkActiveNotifier.java) " + + "--input_file " + + "$(location net/android/java/src/org/chromium/net/NetworkChangeNotifier.java) " + + "--input_file " + + "$(location net/android/java/src/org/chromium/net/ProxyChangeListener.java) " + + "--input_file " + + "$(location net/android/java/src/org/chromium/net/X509Util.java)", + out: [ + "net/net_jni_headers/AndroidCertVerifyResult_jni.h", + "net/net_jni_headers/AndroidKeyStore_jni.h", + "net/net_jni_headers/AndroidNetworkLibrary_jni.h", + "net/net_jni_headers/AndroidTrafficStats_jni.h", + "net/net_jni_headers/DnsStatus_jni.h", + "net/net_jni_headers/GURLUtils_jni.h", + "net/net_jni_headers/HttpNegotiateAuthenticator_jni.h", + "net/net_jni_headers/HttpUtil_jni.h", + "net/net_jni_headers/NetStringUtil_jni.h", + "net/net_jni_headers/NetworkActiveNotifier_jni.h", + "net/net_jni_headers/NetworkChangeNotifier_jni.h", + "net/net_jni_headers/ProxyChangeListener_jni.h", + "net/net_jni_headers/X509Util_jni.h", + ], + tool_files: [ + "base/android/jni_generator/android_jar.classes", + "base/android/jni_generator/jni_generator.py", + "build/android/gyp/util/__init__.py", + "build/android/gyp/util/build_utils.py", + "build/gn_helpers.py", + ], +} + +// GN: //net:net_jni_headers__android_x86_64 +genrule { + name: "cronet_aml_net_net_jni_headers__android_x86_64", srcs: [ "net/android/java/src/org/chromium/net/AndroidCertVerifyResult.java", "net/android/java/src/org/chromium/net/AndroidKeyStore.java", @@ -5364,11 +7211,15 @@ cc_library_static { "cronet_aml_url_url", ], generated_headers: [ - "cronet_aml_build_chromeos_buildflags", + "cronet_aml_build_chromeos_buildflags__android_x86", + "cronet_aml_build_chromeos_buildflags__android_x86_64", + "cronet_aml_build_chromeos_buildflags__host", "cronet_aml_net_third_party_quiche_net_quic_proto_gen_headers", ], export_generated_headers: [ - "cronet_aml_build_chromeos_buildflags", + "cronet_aml_build_chromeos_buildflags__android_x86", + "cronet_aml_build_chromeos_buildflags__android_x86_64", + "cronet_aml_build_chromeos_buildflags__host", "cronet_aml_net_third_party_quiche_net_quic_proto_gen_headers", ], defaults: [ @@ -9124,9 +10975,29 @@ cc_defaults { name: "cronet_aml_third_party_zlib_zlib_slide_hash_simd", } -// GN: //url:buildflags +// GN: //url:buildflags__android_x86 genrule { - name: "cronet_aml_url_buildflags", + name: "cronet_aml_url_buildflags__android_x86", + cmd: "echo '--flags USE_PLATFORM_ICU_ALTERNATIVES=\"true\"' | " + + "$(location build/write_buildflag_header.py) --output " + + "$(out) " + + "--rulename " + + "//url:buildflags " + + "--gen-dir " + + ". " + + "--definitions " + + "/dev/stdin", + out: [ + "url/buildflags.h", + ], + tool_files: [ + "build/write_buildflag_header.py", + ], +} + +// GN: //url:buildflags__android_x86_64 +genrule { + name: "cronet_aml_url_buildflags__android_x86_64", cmd: "echo '--flags USE_PLATFORM_ICU_ALTERNATIVES=\"true\"' | " + "$(location build/write_buildflag_header.py) --output " + "$(out) " + @@ -9188,18 +11059,28 @@ cc_library_static { "cronet_aml_third_party_modp_b64_modp_b64", ], generated_headers: [ - "cronet_aml_base_debugging_buildflags", - "cronet_aml_base_logging_buildflags", - "cronet_aml_build_chromeos_buildflags", - "cronet_aml_url_buildflags", - "cronet_aml_url_url_jni_headers", + "cronet_aml_base_debugging_buildflags__android_x86", + "cronet_aml_base_debugging_buildflags__android_x86_64", + "cronet_aml_base_logging_buildflags__android_x86", + "cronet_aml_base_logging_buildflags__android_x86_64", + "cronet_aml_build_chromeos_buildflags__android_x86", + "cronet_aml_build_chromeos_buildflags__android_x86_64", + "cronet_aml_url_buildflags__android_x86", + "cronet_aml_url_buildflags__android_x86_64", + "cronet_aml_url_url_jni_headers__android_x86", + "cronet_aml_url_url_jni_headers__android_x86_64", ], export_generated_headers: [ - "cronet_aml_base_debugging_buildflags", - "cronet_aml_base_logging_buildflags", - "cronet_aml_build_chromeos_buildflags", - "cronet_aml_url_buildflags", - "cronet_aml_url_url_jni_headers", + "cronet_aml_base_debugging_buildflags__android_x86", + "cronet_aml_base_debugging_buildflags__android_x86_64", + "cronet_aml_base_logging_buildflags__android_x86", + "cronet_aml_base_logging_buildflags__android_x86_64", + "cronet_aml_build_chromeos_buildflags__android_x86", + "cronet_aml_build_chromeos_buildflags__android_x86_64", + "cronet_aml_url_buildflags__android_x86", + "cronet_aml_url_buildflags__android_x86_64", + "cronet_aml_url_url_jni_headers__android_x86", + "cronet_aml_url_url_jni_headers__android_x86_64", ], defaults: [ "cronet_aml_defaults", @@ -9234,9 +11115,46 @@ cc_library_static { cpp_std: "c++20", } -// GN: //url:url_jni_headers +// GN: //url:url_jni_headers__android_x86 genrule { - name: "cronet_aml_url_url_jni_headers", + name: "cronet_aml_url_url_jni_headers__android_x86", + srcs: [ + "url/android/java/src/org/chromium/url/IDNStringUtil.java", + "url/android/java/src/org/chromium/url/Origin.java", + ], + cmd: "$(location base/android/jni_generator/jni_generator.py) --ptr_type " + + "long " + + " " + + " " + + "--output_dir " + + "$(genDir)/url/url_jni_headers " + + "--includes " + + "base/android/jni_generator/jni_generator_helper.h " + + "--use_proxy_hash " + + "--output_name " + + "IDNStringUtil_jni.h " + + "--output_name " + + "Origin_jni.h " + + "--input_file " + + "$(location url/android/java/src/org/chromium/url/IDNStringUtil.java) " + + "--input_file " + + "$(location url/android/java/src/org/chromium/url/Origin.java)", + out: [ + "url/url_jni_headers/IDNStringUtil_jni.h", + "url/url_jni_headers/Origin_jni.h", + ], + tool_files: [ + "base/android/jni_generator/android_jar.classes", + "base/android/jni_generator/jni_generator.py", + "build/android/gyp/util/__init__.py", + "build/android/gyp/util/build_utils.py", + "build/gn_helpers.py", + ], +} + +// GN: //url:url_jni_headers__android_x86_64 +genrule { + name: "cronet_aml_url_url_jni_headers__android_x86_64", srcs: [ "url/android/java/src/org/chromium/url/IDNStringUtil.java", "url/android/java/src/org/chromium/url/Origin.java", diff --git a/tools/gn2bp/gn_utils.py b/tools/gn2bp/gn_utils.py index d9e677a023..6d23c55a73 100644 --- a/tools/gn2bp/gn_utils.py +++ b/tools/gn2bp/gn_utils.py @@ -273,11 +273,19 @@ class GnParser(object): # Use name without toolchain for targets to support targets built for # multiple archs. target_name = label_without_toolchain(gn_target_name) - target = self.all_targets.get(target_name) desc = gn_desc[gn_target_name] + type_ = desc['type'] arch = self._get_arch(desc['toolchain']) + + # Action modules can differ depending on the target architecture, yet + # genrule's do not allow to overload cmd per target OS / arch. Create a + # separate action for every architecture. + if type_ == 'action': + target_name += '__' + arch + + target = self.all_targets.get(target_name) if target is None: - target = GnParser.Target(target_name, desc['type']) + target = GnParser.Target(target_name, type_) self.all_targets[target_name] = target if arch not in target.arch: