diff --git a/tools/gn2bp/Android.bp.swp b/tools/gn2bp/Android.bp.swp
index ca8741ffa72b1f10549ca490eda496d86a8ee581..d2ed74d99861deeb2b62e35dd10cdff4b05d79aa 100644
--- a/tools/gn2bp/Android.bp.swp
+++ b/tools/gn2bp/Android.bp.swp
@@ -2629,25 +2629,16 @@ cc_library_static {
"base/files/scoped_file_linux.cc",
"base/memory/platform_shared_memory_mapper_posix.cc",
"base/memory/platform_shared_memory_region_posix.cc",
- "base/nix/mime_util_xdg.cc",
- "base/nix/xdg_util.cc",
"base/power_monitor/power_monitor_device_source_stub.cc",
"base/process/process_linux.cc",
"base/profiler/stack_sampler_posix.cc",
"base/stack_canary_linux.cc",
"base/threading/platform_thread_linux.cc",
],
- static_libs: [
- "cronet_aml_base_third_party_symbolize_symbolize__testing",
- "cronet_aml_base_third_party_xdg_mime_xdg_mime__testing",
- "cronet_aml_base_third_party_xdg_user_dirs_xdg_user_dirs__testing",
- ],
cflags: [
"-DCR_SYSROOT_KEY=20220331T153654Z-0",
- "-DGLOG_EXPORT=",
"-DUSE_AURA=1",
"-DUSE_OZONE=1",
- "-DUSE_SYMBOLIZE",
"-DUSE_UDEV",
"-D_FILE_OFFSET_BITS=64",
"-D_LARGEFILE64_SOURCE",
@@ -3426,7 +3417,7 @@ cc_library_static {
cc_genrule {
name: "cronet_aml_base_build_date",
cmd: "$(location build/write_build_date_header.py) $(out) " +
- "1676008584",
+ "1674644139",
out: [
"base/generated_build_date.h",
],
@@ -3442,7 +3433,7 @@ cc_genrule {
cc_genrule {
name: "cronet_aml_base_build_date__testing",
cmd: "$(location build/write_build_date_header.py) $(out) " +
- "1676008584",
+ "1674644139",
host_supported: true,
out: [
"base/generated_build_date.h",
@@ -5447,180 +5438,6 @@ cc_library_static {
},
}
-// GN: //base/third_party/symbolize:symbolize__testing
-cc_library_static {
- name: "cronet_aml_base_third_party_symbolize_symbolize__testing",
- srcs: [
- "base/third_party/symbolize/demangle.cc",
- "base/third_party/symbolize/symbolize.cc",
- ],
- host_supported: true,
- device_supported: false,
- defaults: [
- "cronet_aml_defaults",
- ],
- cflags: [
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
- "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
- "-DCR_SYSROOT_KEY=20220331T153654Z-0",
- "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
- "-DGLOG_EXPORT=",
- "-DNDEBUG",
- "-DNO_UNWIND_TABLES",
- "-DNVALGRIND",
- "-DOFFICIAL_BUILD",
- "-DUSE_AURA=1",
- "-DUSE_OZONE=1",
- "-DUSE_UDEV",
- "-D_FILE_OFFSET_BITS=64",
- "-D_GNU_SOURCE",
- "-D_LARGEFILE64_SOURCE",
- "-D_LARGEFILE_SOURCE",
- "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
- "-O2",
- "-fdata-sections",
- "-ffunction-sections",
- "-fno-asynchronous-unwind-tables",
- "-fno-unwind-tables",
- "-fstack-protector",
- "-fvisibility-inlines-hidden",
- "-fvisibility=hidden",
- "-g1",
- "-msse3",
- ],
- local_include_dirs: [
- "./",
- "buildtools/third_party/libc++/",
- "buildtools/third_party/libc++/trunk/include",
- "buildtools/third_party/libc++abi/trunk/include",
- ],
- cpp_std: "c++20",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
-}
-
-// GN: //base/third_party/xdg_mime:xdg_mime__testing
-cc_library_static {
- name: "cronet_aml_base_third_party_xdg_mime_xdg_mime__testing",
- srcs: [
- "base/third_party/xdg_mime/xdgmime.c",
- "base/third_party/xdg_mime/xdgmimealias.c",
- "base/third_party/xdg_mime/xdgmimecache.c",
- "base/third_party/xdg_mime/xdgmimeglob.c",
- "base/third_party/xdg_mime/xdgmimeicon.c",
- "base/third_party/xdg_mime/xdgmimeint.c",
- "base/third_party/xdg_mime/xdgmimemagic.c",
- "base/third_party/xdg_mime/xdgmimeparent.c",
- ],
- host_supported: true,
- device_supported: false,
- defaults: [
- "cronet_aml_defaults",
- ],
- cflags: [
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
- "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
- "-DCR_SYSROOT_KEY=20220331T153654Z-0",
- "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
- "-DNDEBUG",
- "-DNO_UNWIND_TABLES",
- "-DNVALGRIND",
- "-DOFFICIAL_BUILD",
- "-DUSE_AURA=1",
- "-DUSE_OZONE=1",
- "-DUSE_UDEV",
- "-D_FILE_OFFSET_BITS=64",
- "-D_GNU_SOURCE",
- "-D_LARGEFILE64_SOURCE",
- "-D_LARGEFILE_SOURCE",
- "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
- "-O2",
- "-fdata-sections",
- "-ffunction-sections",
- "-fno-asynchronous-unwind-tables",
- "-fno-unwind-tables",
- "-fstack-protector",
- "-fvisibility-inlines-hidden",
- "-fvisibility=hidden",
- "-g1",
- "-msse3",
- ],
- local_include_dirs: [
- "./",
- "buildtools/third_party/libc++/",
- "buildtools/third_party/libc++/trunk/include",
- "buildtools/third_party/libc++abi/trunk/include",
- ],
- cpp_std: "c++20",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
-}
-
-// GN: //base/third_party/xdg_user_dirs:xdg_user_dirs__testing
-cc_library_static {
- name: "cronet_aml_base_third_party_xdg_user_dirs_xdg_user_dirs__testing",
- srcs: [
- "base/third_party/xdg_user_dirs/xdg_user_dir_lookup.cc",
- ],
- host_supported: true,
- device_supported: false,
- defaults: [
- "cronet_aml_defaults",
- ],
- cflags: [
- "-DCR_CLANG_REVISION=\"llvmorg-16-init-6578-g0d30e92f-2\"",
- "-DCR_LIBCXX_REVISION=64d36e572d3f9719c5d75011a718f33f11126851",
- "-DCR_SYSROOT_KEY=20220331T153654Z-0",
- "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
- "-DNDEBUG",
- "-DNO_UNWIND_TABLES",
- "-DNVALGRIND",
- "-DOFFICIAL_BUILD",
- "-DUSE_AURA=1",
- "-DUSE_OZONE=1",
- "-DUSE_UDEV",
- "-D_FILE_OFFSET_BITS=64",
- "-D_FORTIFY_SOURCE=2",
- "-D_GNU_SOURCE",
- "-D_LARGEFILE64_SOURCE",
- "-D_LARGEFILE_SOURCE",
- "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS",
- "-D__STDC_CONSTANT_MACROS",
- "-D__STDC_FORMAT_MACROS",
- "-O2",
- "-fdata-sections",
- "-ffunction-sections",
- "-fno-asynchronous-unwind-tables",
- "-fno-unwind-tables",
- "-fstack-protector",
- "-fvisibility-inlines-hidden",
- "-fvisibility=hidden",
- "-g1",
- "-msse3",
- ],
- local_include_dirs: [
- "./",
- "buildtools/third_party/libc++/",
- "buildtools/third_party/libc++/trunk/include",
- "buildtools/third_party/libc++abi/trunk/include",
- ],
- cpp_std: "c++20",
- ldflags: [
- "-Wl,--as-needed",
- "-Wl,--gc-sections",
- "-Wl,--icf=all",
- ],
-}
-
// GN: //base:tracing_buildflags
cc_genrule {
name: "cronet_aml_base_tracing_buildflags",
@@ -10351,11 +10168,6 @@ cc_library_static {
],
},
host: {
- static_libs: [
- "cronet_aml_base_third_party_symbolize_symbolize__testing",
- "cronet_aml_base_third_party_xdg_mime_xdg_mime__testing",
- "cronet_aml_base_third_party_xdg_user_dirs_xdg_user_dirs__testing",
- ],
cflags: [
"-DCR_SYSROOT_KEY=20220331T153654Z-0",
"-DUSE_AURA=1",
@@ -16624,9 +16436,6 @@ cc_object {
"cronet_aml_base_base_static__testing",
"cronet_aml_base_third_party_double_conversion_double_conversion__testing",
"cronet_aml_base_third_party_dynamic_annotations_dynamic_annotations__testing",
- "cronet_aml_base_third_party_symbolize_symbolize__testing",
- "cronet_aml_base_third_party_xdg_mime_xdg_mime__testing",
- "cronet_aml_base_third_party_xdg_user_dirs_xdg_user_dirs__testing",
"cronet_aml_third_party_boringssl_boringssl__testing",
"cronet_aml_third_party_icu_icui18n__testing",
"cronet_aml_third_party_icu_icuuc_private__testing",
@@ -16785,9 +16594,6 @@ cc_binary {
"cronet_aml_base_base_static__testing",
"cronet_aml_base_third_party_double_conversion_double_conversion__testing",
"cronet_aml_base_third_party_dynamic_annotations_dynamic_annotations__testing",
- "cronet_aml_base_third_party_symbolize_symbolize__testing",
- "cronet_aml_base_third_party_xdg_mime_xdg_mime__testing",
- "cronet_aml_base_third_party_xdg_user_dirs_xdg_user_dirs__testing",
"cronet_aml_crypto_crypto__testing",
"cronet_aml_third_party_boringssl_boringssl__testing",
"cronet_aml_third_party_icu_icui18n__testing",
@@ -16866,9 +16672,6 @@ cc_object {
"cronet_aml_base_base_static__testing",
"cronet_aml_base_third_party_double_conversion_double_conversion__testing",
"cronet_aml_base_third_party_dynamic_annotations_dynamic_annotations__testing",
- "cronet_aml_base_third_party_symbolize_symbolize__testing",
- "cronet_aml_base_third_party_xdg_mime_xdg_mime__testing",
- "cronet_aml_base_third_party_xdg_user_dirs_xdg_user_dirs__testing",
"cronet_aml_third_party_boringssl_boringssl__testing",
"cronet_aml_third_party_icu_icui18n__testing",
"cronet_aml_third_party_icu_icuuc_private__testing",
diff --git a/tools/gn2bp/desc_arm.json b/tools/gn2bp/desc_arm.json
index 6f72c9408832fec9744b20d2221acee340d8750f..87b86e3722742d716a7359bdfbb302cd5d042363 100644
Binary files a/tools/gn2bp/desc_arm.json and b/tools/gn2bp/desc_arm.json differ
diff --git a/tools/gn2bp/desc_arm64.json b/tools/gn2bp/desc_arm64.json
index 0732834a321ecc2d21b43e67a5fb003b77fa642a..7b8bfe31c30b5e99dfda5237d8d315c99019842b 100644
Binary files a/tools/gn2bp/desc_arm64.json and b/tools/gn2bp/desc_arm64.json differ
diff --git a/tools/gn2bp/desc_x64.json b/tools/gn2bp/desc_x64.json
index 49e5caea6e658c9232506a091001ad1276b7f4f0..df8635aa5794e9245852116d5c1a3822150c11d5 100644
Binary files a/tools/gn2bp/desc_x64.json and b/tools/gn2bp/desc_x64.json differ
diff --git a/tools/gn2bp/desc_x86.json b/tools/gn2bp/desc_x86.json
index 51d41532fca398b74e0319a8cdc3bb59187b361d..707b9c70fadb698aa15e9d8652aae35913785fd0 100644
Binary files a/tools/gn2bp/desc_x86.json and b/tools/gn2bp/desc_x86.json differ