diff --git a/tools/gn2bp/Android.bp.swp b/tools/gn2bp/Android.bp.swp index 24e09ccd9a..7124ab0910 100644 --- a/tools/gn2bp/Android.bp.swp +++ b/tools/gn2bp/Android.bp.swp @@ -3592,247 +3592,261 @@ genrule { } // GN: //buildtools/third_party/libc++:libc++ -cc_defaults { +cc_library_static { name: "cronet_aml_buildtools_third_party_libc___libc__", + srcs: [ + "buildtools/third_party/libc++/trunk/src/algorithm.cpp", + "buildtools/third_party/libc++/trunk/src/any.cpp", + "buildtools/third_party/libc++/trunk/src/atomic.cpp", + "buildtools/third_party/libc++/trunk/src/barrier.cpp", + "buildtools/third_party/libc++/trunk/src/bind.cpp", + "buildtools/third_party/libc++/trunk/src/charconv.cpp", + "buildtools/third_party/libc++/trunk/src/chrono.cpp", + "buildtools/third_party/libc++/trunk/src/condition_variable.cpp", + "buildtools/third_party/libc++/trunk/src/condition_variable_destructor.cpp", + "buildtools/third_party/libc++/trunk/src/exception.cpp", + "buildtools/third_party/libc++/trunk/src/format.cpp", + "buildtools/third_party/libc++/trunk/src/functional.cpp", + "buildtools/third_party/libc++/trunk/src/future.cpp", + "buildtools/third_party/libc++/trunk/src/hash.cpp", + "buildtools/third_party/libc++/trunk/src/ios.cpp", + "buildtools/third_party/libc++/trunk/src/ios.instantiations.cpp", + "buildtools/third_party/libc++/trunk/src/iostream.cpp", + "buildtools/third_party/libc++/trunk/src/legacy_pointer_safety.cpp", + "buildtools/third_party/libc++/trunk/src/locale.cpp", + "buildtools/third_party/libc++/trunk/src/memory.cpp", + "buildtools/third_party/libc++/trunk/src/mutex.cpp", + "buildtools/third_party/libc++/trunk/src/mutex_destructor.cpp", + "buildtools/third_party/libc++/trunk/src/new.cpp", + "buildtools/third_party/libc++/trunk/src/optional.cpp", + "buildtools/third_party/libc++/trunk/src/random.cpp", + "buildtools/third_party/libc++/trunk/src/random_shuffle.cpp", + "buildtools/third_party/libc++/trunk/src/regex.cpp", + "buildtools/third_party/libc++/trunk/src/ryu/d2fixed.cpp", + "buildtools/third_party/libc++/trunk/src/ryu/d2s.cpp", + "buildtools/third_party/libc++/trunk/src/ryu/f2s.cpp", + "buildtools/third_party/libc++/trunk/src/shared_mutex.cpp", + "buildtools/third_party/libc++/trunk/src/stdexcept.cpp", + "buildtools/third_party/libc++/trunk/src/string.cpp", + "buildtools/third_party/libc++/trunk/src/strstream.cpp", + "buildtools/third_party/libc++/trunk/src/system_error.cpp", + "buildtools/third_party/libc++/trunk/src/thread.cpp", + "buildtools/third_party/libc++/trunk/src/typeinfo.cpp", + "buildtools/third_party/libc++/trunk/src/utility.cpp", + "buildtools/third_party/libc++/trunk/src/valarray.cpp", + "buildtools/third_party/libc++/trunk/src/variant.cpp", + "buildtools/third_party/libc++/trunk/src/vector.cpp", + "buildtools/third_party/libc++/trunk/src/verbose_abort.cpp", + ], + static_libs: [ + "cronet_aml_buildtools_third_party_libc__abi_libc__abi", + ], + host_supported: true, + defaults: [ + "cronet_aml_defaults", + ], + cflags: [ + "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"", + "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc", + "-DDCHECK_ALWAYS_ON=1", + "-DDYNAMIC_ANNOTATIONS_ENABLED=1", + "-DLIBCXX_BUILDING_LIBCXXABI", + "-D_DEBUG", + "-D_GNU_SOURCE", + "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1", + "-D_LIBCPP_BUILDING_LIBRARY", + "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", + "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1", + "-D_LIBCPP_OVERRIDABLE_FUNC_VIS=__attribute__((__visibility__(\"default\")))", + "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", + ], + local_include_dirs: [ + "./", + "buildtools/third_party/libc++/", + "buildtools/third_party/libc++/trunk/include", + "buildtools/third_party/libc++/trunk/src/", + "buildtools/third_party/libc++abi/trunk/include", + ], + cpp_std: "c++20", + cppflags: [ + "-fexceptions", + ], + rtti: true, target: { android_x86: { - srcs: [ - "buildtools/third_party/libc++/trunk/src/algorithm.cpp", - "buildtools/third_party/libc++/trunk/src/any.cpp", - "buildtools/third_party/libc++/trunk/src/atomic.cpp", - "buildtools/third_party/libc++/trunk/src/barrier.cpp", - "buildtools/third_party/libc++/trunk/src/bind.cpp", - "buildtools/third_party/libc++/trunk/src/charconv.cpp", - "buildtools/third_party/libc++/trunk/src/chrono.cpp", - "buildtools/third_party/libc++/trunk/src/condition_variable.cpp", - "buildtools/third_party/libc++/trunk/src/condition_variable_destructor.cpp", - "buildtools/third_party/libc++/trunk/src/exception.cpp", - "buildtools/third_party/libc++/trunk/src/format.cpp", - "buildtools/third_party/libc++/trunk/src/functional.cpp", - "buildtools/third_party/libc++/trunk/src/future.cpp", - "buildtools/third_party/libc++/trunk/src/hash.cpp", - "buildtools/third_party/libc++/trunk/src/ios.cpp", - "buildtools/third_party/libc++/trunk/src/ios.instantiations.cpp", - "buildtools/third_party/libc++/trunk/src/iostream.cpp", - "buildtools/third_party/libc++/trunk/src/legacy_pointer_safety.cpp", - "buildtools/third_party/libc++/trunk/src/locale.cpp", - "buildtools/third_party/libc++/trunk/src/memory.cpp", - "buildtools/third_party/libc++/trunk/src/mutex.cpp", - "buildtools/third_party/libc++/trunk/src/mutex_destructor.cpp", - "buildtools/third_party/libc++/trunk/src/new.cpp", - "buildtools/third_party/libc++/trunk/src/optional.cpp", - "buildtools/third_party/libc++/trunk/src/random.cpp", - "buildtools/third_party/libc++/trunk/src/random_shuffle.cpp", - "buildtools/third_party/libc++/trunk/src/regex.cpp", - "buildtools/third_party/libc++/trunk/src/ryu/d2fixed.cpp", - "buildtools/third_party/libc++/trunk/src/ryu/d2s.cpp", - "buildtools/third_party/libc++/trunk/src/ryu/f2s.cpp", - "buildtools/third_party/libc++/trunk/src/shared_mutex.cpp", - "buildtools/third_party/libc++/trunk/src/stdexcept.cpp", - "buildtools/third_party/libc++/trunk/src/string.cpp", - "buildtools/third_party/libc++/trunk/src/strstream.cpp", - "buildtools/third_party/libc++/trunk/src/system_error.cpp", - "buildtools/third_party/libc++/trunk/src/thread.cpp", - "buildtools/third_party/libc++/trunk/src/typeinfo.cpp", - "buildtools/third_party/libc++/trunk/src/utility.cpp", - "buildtools/third_party/libc++/trunk/src/valarray.cpp", - "buildtools/third_party/libc++/trunk/src/variant.cpp", - "buildtools/third_party/libc++/trunk/src/vector.cpp", - "buildtools/third_party/libc++/trunk/src/verbose_abort.cpp", + static_libs: [ + "cronet_aml_buildtools_third_party_libunwind_libunwind", + ], + cflags: [ + "-DANDROID", + "-DANDROID_NDK_VERSION_ROLL=r23_1", + "-DHAVE_SYS_UIO_H", ], }, android_x86_64: { - srcs: [ - "buildtools/third_party/libc++/trunk/src/algorithm.cpp", - "buildtools/third_party/libc++/trunk/src/any.cpp", - "buildtools/third_party/libc++/trunk/src/atomic.cpp", - "buildtools/third_party/libc++/trunk/src/barrier.cpp", - "buildtools/third_party/libc++/trunk/src/bind.cpp", - "buildtools/third_party/libc++/trunk/src/charconv.cpp", - "buildtools/third_party/libc++/trunk/src/chrono.cpp", - "buildtools/third_party/libc++/trunk/src/condition_variable.cpp", - "buildtools/third_party/libc++/trunk/src/condition_variable_destructor.cpp", - "buildtools/third_party/libc++/trunk/src/exception.cpp", - "buildtools/third_party/libc++/trunk/src/format.cpp", - "buildtools/third_party/libc++/trunk/src/functional.cpp", - "buildtools/third_party/libc++/trunk/src/future.cpp", - "buildtools/third_party/libc++/trunk/src/hash.cpp", - "buildtools/third_party/libc++/trunk/src/ios.cpp", - "buildtools/third_party/libc++/trunk/src/ios.instantiations.cpp", - "buildtools/third_party/libc++/trunk/src/iostream.cpp", - "buildtools/third_party/libc++/trunk/src/legacy_pointer_safety.cpp", - "buildtools/third_party/libc++/trunk/src/locale.cpp", - "buildtools/third_party/libc++/trunk/src/memory.cpp", - "buildtools/third_party/libc++/trunk/src/mutex.cpp", - "buildtools/third_party/libc++/trunk/src/mutex_destructor.cpp", - "buildtools/third_party/libc++/trunk/src/new.cpp", - "buildtools/third_party/libc++/trunk/src/optional.cpp", - "buildtools/third_party/libc++/trunk/src/random.cpp", - "buildtools/third_party/libc++/trunk/src/random_shuffle.cpp", - "buildtools/third_party/libc++/trunk/src/regex.cpp", - "buildtools/third_party/libc++/trunk/src/ryu/d2fixed.cpp", - "buildtools/third_party/libc++/trunk/src/ryu/d2s.cpp", - "buildtools/third_party/libc++/trunk/src/ryu/f2s.cpp", - "buildtools/third_party/libc++/trunk/src/shared_mutex.cpp", - "buildtools/third_party/libc++/trunk/src/stdexcept.cpp", - "buildtools/third_party/libc++/trunk/src/string.cpp", - "buildtools/third_party/libc++/trunk/src/strstream.cpp", - "buildtools/third_party/libc++/trunk/src/system_error.cpp", - "buildtools/third_party/libc++/trunk/src/thread.cpp", - "buildtools/third_party/libc++/trunk/src/typeinfo.cpp", - "buildtools/third_party/libc++/trunk/src/utility.cpp", - "buildtools/third_party/libc++/trunk/src/valarray.cpp", - "buildtools/third_party/libc++/trunk/src/variant.cpp", - "buildtools/third_party/libc++/trunk/src/vector.cpp", - "buildtools/third_party/libc++/trunk/src/verbose_abort.cpp", + static_libs: [ + "cronet_aml_buildtools_third_party_libunwind_libunwind", + ], + cflags: [ + "-DANDROID", + "-DANDROID_NDK_VERSION_ROLL=r23_1", + "-DHAVE_SYS_UIO_H", ], }, host: { - srcs: [ - "buildtools/third_party/libc++/trunk/src/algorithm.cpp", - "buildtools/third_party/libc++/trunk/src/any.cpp", - "buildtools/third_party/libc++/trunk/src/atomic.cpp", - "buildtools/third_party/libc++/trunk/src/barrier.cpp", - "buildtools/third_party/libc++/trunk/src/bind.cpp", - "buildtools/third_party/libc++/trunk/src/charconv.cpp", - "buildtools/third_party/libc++/trunk/src/chrono.cpp", - "buildtools/third_party/libc++/trunk/src/condition_variable.cpp", - "buildtools/third_party/libc++/trunk/src/condition_variable_destructor.cpp", - "buildtools/third_party/libc++/trunk/src/exception.cpp", - "buildtools/third_party/libc++/trunk/src/format.cpp", - "buildtools/third_party/libc++/trunk/src/functional.cpp", - "buildtools/third_party/libc++/trunk/src/future.cpp", - "buildtools/third_party/libc++/trunk/src/hash.cpp", - "buildtools/third_party/libc++/trunk/src/ios.cpp", - "buildtools/third_party/libc++/trunk/src/ios.instantiations.cpp", - "buildtools/third_party/libc++/trunk/src/iostream.cpp", - "buildtools/third_party/libc++/trunk/src/legacy_pointer_safety.cpp", - "buildtools/third_party/libc++/trunk/src/locale.cpp", - "buildtools/third_party/libc++/trunk/src/memory.cpp", - "buildtools/third_party/libc++/trunk/src/mutex.cpp", - "buildtools/third_party/libc++/trunk/src/mutex_destructor.cpp", - "buildtools/third_party/libc++/trunk/src/new.cpp", - "buildtools/third_party/libc++/trunk/src/optional.cpp", - "buildtools/third_party/libc++/trunk/src/random.cpp", - "buildtools/third_party/libc++/trunk/src/random_shuffle.cpp", - "buildtools/third_party/libc++/trunk/src/regex.cpp", - "buildtools/third_party/libc++/trunk/src/ryu/d2fixed.cpp", - "buildtools/third_party/libc++/trunk/src/ryu/d2s.cpp", - "buildtools/third_party/libc++/trunk/src/ryu/f2s.cpp", - "buildtools/third_party/libc++/trunk/src/shared_mutex.cpp", - "buildtools/third_party/libc++/trunk/src/stdexcept.cpp", - "buildtools/third_party/libc++/trunk/src/string.cpp", - "buildtools/third_party/libc++/trunk/src/strstream.cpp", - "buildtools/third_party/libc++/trunk/src/system_error.cpp", - "buildtools/third_party/libc++/trunk/src/thread.cpp", - "buildtools/third_party/libc++/trunk/src/typeinfo.cpp", - "buildtools/third_party/libc++/trunk/src/utility.cpp", - "buildtools/third_party/libc++/trunk/src/valarray.cpp", - "buildtools/third_party/libc++/trunk/src/variant.cpp", - "buildtools/third_party/libc++/trunk/src/vector.cpp", - "buildtools/third_party/libc++/trunk/src/verbose_abort.cpp", + cflags: [ + "-DCR_SYSROOT_KEY=20220331T153654Z-0", + "-DUSE_AURA=1", + "-DUSE_OZONE=1", + "-DUSE_UDEV", + "-D_FILE_OFFSET_BITS=64", + "-D_LARGEFILE64_SOURCE", + "-D_LARGEFILE_SOURCE", ], }, }, } // GN: //buildtools/third_party/libc++abi:libc++abi -cc_defaults { +cc_library_static { name: "cronet_aml_buildtools_third_party_libc__abi_libc__abi", + srcs: [ + "buildtools/third_party/libc++abi/trunk/src/abort_message.cpp", + "buildtools/third_party/libc++abi/trunk/src/cxa_aux_runtime.cpp", + "buildtools/third_party/libc++abi/trunk/src/cxa_default_handlers.cpp", + "buildtools/third_party/libc++abi/trunk/src/cxa_exception.cpp", + "buildtools/third_party/libc++abi/trunk/src/cxa_exception_storage.cpp", + "buildtools/third_party/libc++abi/trunk/src/cxa_guard.cpp", + "buildtools/third_party/libc++abi/trunk/src/cxa_handlers.cpp", + "buildtools/third_party/libc++abi/trunk/src/cxa_personality.cpp", + "buildtools/third_party/libc++abi/trunk/src/cxa_thread_atexit.cpp", + "buildtools/third_party/libc++abi/trunk/src/cxa_vector.cpp", + "buildtools/third_party/libc++abi/trunk/src/cxa_virtual.cpp", + "buildtools/third_party/libc++abi/trunk/src/fallback_malloc.cpp", + "buildtools/third_party/libc++abi/trunk/src/private_typeinfo.cpp", + "buildtools/third_party/libc++abi/trunk/src/stdlib_exception.cpp", + "buildtools/third_party/libc++abi/trunk/src/stdlib_stdexcept.cpp", + "buildtools/third_party/libc++abi/trunk/src/stdlib_typeinfo.cpp", + ], + host_supported: true, + defaults: [ + "cronet_aml_defaults", + ], + cflags: [ + "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"", + "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc", + "-DDCHECK_ALWAYS_ON=1", + "-DDYNAMIC_ANNOTATIONS_ENABLED=1", + "-DLIBCXXABI_SILENT_TERMINATE", + "-D_DEBUG", + "-D_GNU_SOURCE", + "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1", + "-D_LIBCPP_BUILDING_LIBRARY", + "-D_LIBCPP_CONSTINIT=constinit", + "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", + "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1", + "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", + ], + local_include_dirs: [ + "./", + "buildtools/third_party/libc++/", + "buildtools/third_party/libc++/trunk/include", + "buildtools/third_party/libc++/trunk/src/", + "buildtools/third_party/libc++abi/trunk/include", + ], + cpp_std: "c++20", + cppflags: [ + "-fexceptions", + ], + rtti: true, target: { android_x86: { srcs: [ "buildtools/third_party/libc++abi/cxa_demangle_stub.cc", - "buildtools/third_party/libc++abi/trunk/src/abort_message.cpp", - "buildtools/third_party/libc++abi/trunk/src/cxa_aux_runtime.cpp", - "buildtools/third_party/libc++abi/trunk/src/cxa_default_handlers.cpp", - "buildtools/third_party/libc++abi/trunk/src/cxa_exception.cpp", - "buildtools/third_party/libc++abi/trunk/src/cxa_exception_storage.cpp", - "buildtools/third_party/libc++abi/trunk/src/cxa_guard.cpp", - "buildtools/third_party/libc++abi/trunk/src/cxa_handlers.cpp", - "buildtools/third_party/libc++abi/trunk/src/cxa_personality.cpp", - "buildtools/third_party/libc++abi/trunk/src/cxa_thread_atexit.cpp", - "buildtools/third_party/libc++abi/trunk/src/cxa_vector.cpp", - "buildtools/third_party/libc++abi/trunk/src/cxa_virtual.cpp", - "buildtools/third_party/libc++abi/trunk/src/fallback_malloc.cpp", - "buildtools/third_party/libc++abi/trunk/src/private_typeinfo.cpp", - "buildtools/third_party/libc++abi/trunk/src/stdlib_exception.cpp", - "buildtools/third_party/libc++abi/trunk/src/stdlib_stdexcept.cpp", - "buildtools/third_party/libc++abi/trunk/src/stdlib_typeinfo.cpp", + ], + static_libs: [ + "cronet_aml_buildtools_third_party_libunwind_libunwind", + ], + cflags: [ + "-DANDROID", + "-DANDROID_NDK_VERSION_ROLL=r23_1", + "-DHAVE_SYS_UIO_H", ], }, android_x86_64: { srcs: [ "buildtools/third_party/libc++abi/cxa_demangle_stub.cc", - "buildtools/third_party/libc++abi/trunk/src/abort_message.cpp", - "buildtools/third_party/libc++abi/trunk/src/cxa_aux_runtime.cpp", - "buildtools/third_party/libc++abi/trunk/src/cxa_default_handlers.cpp", - "buildtools/third_party/libc++abi/trunk/src/cxa_exception.cpp", - "buildtools/third_party/libc++abi/trunk/src/cxa_exception_storage.cpp", - "buildtools/third_party/libc++abi/trunk/src/cxa_guard.cpp", - "buildtools/third_party/libc++abi/trunk/src/cxa_handlers.cpp", - "buildtools/third_party/libc++abi/trunk/src/cxa_personality.cpp", - "buildtools/third_party/libc++abi/trunk/src/cxa_thread_atexit.cpp", - "buildtools/third_party/libc++abi/trunk/src/cxa_vector.cpp", - "buildtools/third_party/libc++abi/trunk/src/cxa_virtual.cpp", - "buildtools/third_party/libc++abi/trunk/src/fallback_malloc.cpp", - "buildtools/third_party/libc++abi/trunk/src/private_typeinfo.cpp", - "buildtools/third_party/libc++abi/trunk/src/stdlib_exception.cpp", - "buildtools/third_party/libc++abi/trunk/src/stdlib_stdexcept.cpp", - "buildtools/third_party/libc++abi/trunk/src/stdlib_typeinfo.cpp", + ], + static_libs: [ + "cronet_aml_buildtools_third_party_libunwind_libunwind", + ], + cflags: [ + "-DANDROID", + "-DANDROID_NDK_VERSION_ROLL=r23_1", + "-DHAVE_SYS_UIO_H", ], }, host: { srcs: [ - "buildtools/third_party/libc++abi/trunk/src/abort_message.cpp", - "buildtools/third_party/libc++abi/trunk/src/cxa_aux_runtime.cpp", - "buildtools/third_party/libc++abi/trunk/src/cxa_default_handlers.cpp", "buildtools/third_party/libc++abi/trunk/src/cxa_demangle.cpp", - "buildtools/third_party/libc++abi/trunk/src/cxa_exception.cpp", - "buildtools/third_party/libc++abi/trunk/src/cxa_exception_storage.cpp", - "buildtools/third_party/libc++abi/trunk/src/cxa_guard.cpp", - "buildtools/third_party/libc++abi/trunk/src/cxa_handlers.cpp", - "buildtools/third_party/libc++abi/trunk/src/cxa_personality.cpp", - "buildtools/third_party/libc++abi/trunk/src/cxa_thread_atexit.cpp", - "buildtools/third_party/libc++abi/trunk/src/cxa_vector.cpp", - "buildtools/third_party/libc++abi/trunk/src/cxa_virtual.cpp", - "buildtools/third_party/libc++abi/trunk/src/fallback_malloc.cpp", - "buildtools/third_party/libc++abi/trunk/src/private_typeinfo.cpp", - "buildtools/third_party/libc++abi/trunk/src/stdlib_exception.cpp", - "buildtools/third_party/libc++abi/trunk/src/stdlib_stdexcept.cpp", - "buildtools/third_party/libc++abi/trunk/src/stdlib_typeinfo.cpp", + ], + cflags: [ + "-DCR_SYSROOT_KEY=20220331T153654Z-0", + "-DUSE_AURA=1", + "-DUSE_OZONE=1", + "-DUSE_UDEV", + "-D_FILE_OFFSET_BITS=64", + "-D_LARGEFILE64_SOURCE", + "-D_LARGEFILE_SOURCE", ], }, }, } // GN: //buildtools/third_party/libunwind:libunwind -cc_defaults { +cc_library_static { name: "cronet_aml_buildtools_third_party_libunwind_libunwind", - target: { - android_x86: { - srcs: [ - "buildtools/third_party/libunwind/trunk/src/Unwind-EHABI.cpp", - "buildtools/third_party/libunwind/trunk/src/Unwind-sjlj.c", - "buildtools/third_party/libunwind/trunk/src/UnwindLevel1-gcc-ext.c", - "buildtools/third_party/libunwind/trunk/src/UnwindLevel1.c", - "buildtools/third_party/libunwind/trunk/src/UnwindRegistersRestore.S", - "buildtools/third_party/libunwind/trunk/src/UnwindRegistersSave.S", - "buildtools/third_party/libunwind/trunk/src/libunwind.cpp", - ], - }, - android_x86_64: { - srcs: [ - "buildtools/third_party/libunwind/trunk/src/Unwind-EHABI.cpp", - "buildtools/third_party/libunwind/trunk/src/Unwind-sjlj.c", - "buildtools/third_party/libunwind/trunk/src/UnwindLevel1-gcc-ext.c", - "buildtools/third_party/libunwind/trunk/src/UnwindLevel1.c", - "buildtools/third_party/libunwind/trunk/src/UnwindRegistersRestore.S", - "buildtools/third_party/libunwind/trunk/src/UnwindRegistersSave.S", - "buildtools/third_party/libunwind/trunk/src/libunwind.cpp", - ], - }, - }, + srcs: [ + "buildtools/third_party/libunwind/trunk/src/Unwind-EHABI.cpp", + "buildtools/third_party/libunwind/trunk/src/Unwind-sjlj.c", + "buildtools/third_party/libunwind/trunk/src/UnwindLevel1-gcc-ext.c", + "buildtools/third_party/libunwind/trunk/src/UnwindLevel1.c", + "buildtools/third_party/libunwind/trunk/src/UnwindRegistersRestore.S", + "buildtools/third_party/libunwind/trunk/src/UnwindRegistersSave.S", + "buildtools/third_party/libunwind/trunk/src/libunwind.cpp", + ], + defaults: [ + "cronet_aml_defaults", + ], + cflags: [ + "-DANDROID", + "-DANDROID_NDK_VERSION_ROLL=r23_1", + "-DCR_CLANG_REVISION=\"llvmorg-16-init-8697-g60809cd2-1\"", + "-DCR_LIBCXX_REVISION=47b31179d10646029c260702650a25d24f555acc", + "-DDCHECK_ALWAYS_ON=1", + "-DDYNAMIC_ANNOTATIONS_ENABLED=1", + "-DHAVE_SYS_UIO_H", + "-D_DEBUG", + "-D_GNU_SOURCE", + "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1", + "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", + "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1", + "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", + "-D_LIBUNWIND_DISABLE_VISIBILITY_ANNOTATIONS", + "-D_LIBUNWIND_IS_NATIVE_ONLY", + ], + local_include_dirs: [ + "./", + "buildtools/third_party/libc++/", + "buildtools/third_party/libc++/trunk/include", + "buildtools/third_party/libc++abi/trunk/include", + "buildtools/third_party/libunwind/trunk/include/", + ], + cpp_std: "c++20", + cppflags: [ + "-fexceptions", + ], + rtti: true, } // GN: //components/cronet/android:buildflags__android_x86 @@ -3892,6 +3906,9 @@ cc_library_shared { "cronet_aml_base_base_static", "cronet_aml_base_third_party_double_conversion_double_conversion", "cronet_aml_base_third_party_dynamic_annotations_dynamic_annotations", + "cronet_aml_buildtools_third_party_libc___libc__", + "cronet_aml_buildtools_third_party_libc__abi_libc__abi", + "cronet_aml_buildtools_third_party_libunwind_libunwind", "cronet_aml_components_prefs_prefs", "cronet_aml_crypto_crypto", "cronet_aml_net_net", @@ -3916,9 +3933,6 @@ cc_library_shared { "cronet_aml_third_party_metrics_proto_metrics_proto_gen_headers", ], defaults: [ - "cronet_aml_buildtools_third_party_libc___libc__", - "cronet_aml_buildtools_third_party_libc__abi_libc__abi", - "cronet_aml_buildtools_third_party_libunwind_libunwind", "cronet_aml_components_cronet_android_cronet_static", "cronet_aml_components_cronet_cronet_common", "cronet_aml_components_cronet_cronet_version_header", @@ -3942,19 +3956,12 @@ cc_library_shared { "-DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER", "-DHAVE_PTHREAD", "-DHAVE_SYS_UIO_H", - "-DLIBCXXABI_SILENT_TERMINATE", - "-DLIBCXX_BUILDING_LIBCXXABI", "-D_DEBUG", "-D_GNU_SOURCE", "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1", - "-D_LIBCPP_BUILDING_LIBRARY", - "-D_LIBCPP_CONSTINIT=constinit", "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1", - "-D_LIBCPP_OVERRIDABLE_FUNC_VIS=__attribute__((__visibility__(\"default\")))", "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", - "-D_LIBUNWIND_DISABLE_VISIBILITY_ANNOTATIONS", - "-D_LIBUNWIND_IS_NATIVE_ONLY", "-D__STDC_CONSTANT_MACROS", "-D__STDC_FORMAT_MACROS", ], @@ -3962,9 +3969,7 @@ cc_library_shared { "./", "buildtools/third_party/libc++/", "buildtools/third_party/libc++/trunk/include", - "buildtools/third_party/libc++/trunk/src/", "buildtools/third_party/libc++abi/trunk/include", - "buildtools/third_party/libunwind/trunk/include/", "components/cronet/native/generated/", "components/cronet/native/include/", "components/grpc_support/include/", @@ -3980,10 +3985,6 @@ cc_library_shared { linker_scripts: [ "base/android/library_loader/anchor_functions.lds", ], - cppflags: [ - "-fexceptions", - ], - rtti: true, target: { android_x86: { generated_headers: [ @@ -4128,7 +4129,276 @@ genrule { genrule { name: "cronet_aml_components_cronet_android_cronet_jni_registration__android_x86", srcs: [ + "base/android/java/src/org/chromium/base/ActivityState.java", + "base/android/java/src/org/chromium/base/ApiCompatibilityUtils.java", + "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/ByteArrayGenerator.java", + "base/android/java/src/org/chromium/base/Callback.java", + "base/android/java/src/org/chromium/base/CallbackController.java", + "base/android/java/src/org/chromium/base/CollectionUtil.java", + "base/android/java/src/org/chromium/base/CommandLine.java", + "base/android/java/src/org/chromium/base/CommandLineInitUtil.java", + "base/android/java/src/org/chromium/base/Consumer.java", + "base/android/java/src/org/chromium/base/ContentUriUtils.java", + "base/android/java/src/org/chromium/base/ContextUtils.java", + "base/android/java/src/org/chromium/base/CpuFeatures.java", + "base/android/java/src/org/chromium/base/DiscardableReferencePool.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/Function.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/IntentUtils.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/JniException.java", + "base/android/java/src/org/chromium/base/JniStaticTestMocker.java", + "base/android/java/src/org/chromium/base/LifetimeAssert.java", + "base/android/java/src/org/chromium/base/LocaleUtils.java", + "base/android/java/src/org/chromium/base/Log.java", + "base/android/java/src/org/chromium/base/MathUtils.java", + "base/android/java/src/org/chromium/base/MemoryPressureListener.java", + "base/android/java/src/org/chromium/base/NativeLibraryLoadedStatus.java", + "base/android/java/src/org/chromium/base/ObserverList.java", + "base/android/java/src/org/chromium/base/PackageManagerUtils.java", + "base/android/java/src/org/chromium/base/PackageUtils.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/PiiElider.java", + "base/android/java/src/org/chromium/base/PowerMonitor.java", + "base/android/java/src/org/chromium/base/PowerMonitorForQ.java", + "base/android/java/src/org/chromium/base/Predicate.java", + "base/android/java/src/org/chromium/base/Promise.java", + "base/android/java/src/org/chromium/base/RadioUtils.java", + "base/android/java/src/org/chromium/base/StreamUtil.java", + "base/android/java/src/org/chromium/base/StrictModeContext.java", + "base/android/java/src/org/chromium/base/ThreadUtils.java", + "base/android/java/src/org/chromium/base/TimeUtils.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/UnownedUserData.java", + "base/android/java/src/org/chromium/base/UnownedUserDataHost.java", + "base/android/java/src/org/chromium/base/UnownedUserDataKey.java", + "base/android/java/src/org/chromium/base/UserData.java", + "base/android/java/src/org/chromium/base/UserDataHost.java", + "base/android/java/src/org/chromium/base/WrappedClassLoader.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", + "base/android/java/src/org/chromium/base/compat/ApiHelperForM.java", + "base/android/java/src/org/chromium/base/compat/ApiHelperForN.java", + "base/android/java/src/org/chromium/base/compat/ApiHelperForO.java", + "base/android/java/src/org/chromium/base/compat/ApiHelperForOMR1.java", + "base/android/java/src/org/chromium/base/compat/ApiHelperForP.java", + "base/android/java/src/org/chromium/base/compat/ApiHelperForQ.java", + "base/android/java/src/org/chromium/base/compat/ApiHelperForR.java", + "base/android/java/src/org/chromium/base/compat/ApiHelperForS.java", + "base/android/java/src/org/chromium/base/jank_tracker/DummyJankTracker.java", + "base/android/java/src/org/chromium/base/jank_tracker/FrameMetrics.java", + "base/android/java/src/org/chromium/base/jank_tracker/FrameMetricsListener.java", + "base/android/java/src/org/chromium/base/jank_tracker/FrameMetricsStore.java", + "base/android/java/src/org/chromium/base/jank_tracker/JankActivityTracker.java", + "base/android/java/src/org/chromium/base/jank_tracker/JankMetricCalculator.java", + "base/android/java/src/org/chromium/base/jank_tracker/JankMetricUMARecorder.java", + "base/android/java/src/org/chromium/base/jank_tracker/JankMetrics.java", + "base/android/java/src/org/chromium/base/jank_tracker/JankReportingRunnable.java", + "base/android/java/src/org/chromium/base/jank_tracker/JankReportingScheduler.java", + "base/android/java/src/org/chromium/base/jank_tracker/JankScenario.java", + "base/android/java/src/org/chromium/base/jank_tracker/JankTracker.java", + "base/android/java/src/org/chromium/base/jank_tracker/JankTrackerImpl.java", + "base/android/java/src/org/chromium/base/library_loader/LegacyLinker.java", + "base/android/java/src/org/chromium/base/library_loader/Linker.java", + "base/android/java/src/org/chromium/base/library_loader/LinkerJni.java", + "base/android/java/src/org/chromium/base/library_loader/LoaderErrors.java", + "base/android/java/src/org/chromium/base/library_loader/ModernLinker.java", + "base/android/java/src/org/chromium/base/library_loader/ModernLinkerJni.java", + "base/android/java/src/org/chromium/base/library_loader/NativeLibraryPreloader.java", + "base/android/java/src/org/chromium/base/library_loader/ProcessInitException.java", + "base/android/java/src/org/chromium/base/lifetime/DestroyChecker.java", + "base/android/java/src/org/chromium/base/lifetime/Destroyable.java", + "base/android/java/src/org/chromium/base/memory/JavaHeapDumpGenerator.java", + "base/android/java/src/org/chromium/base/memory/MemoryPressureCallback.java", + "base/android/java/src/org/chromium/base/memory/MemoryPressureMonitor.java", + "base/android/java/src/org/chromium/base/memory/MemoryPressureUma.java", + "base/android/java/src/org/chromium/base/memory/MemoryPurgeManager.java", + "base/android/java/src/org/chromium/base/metrics/CachingUmaRecorder.java", + "base/android/java/src/org/chromium/base/metrics/NativeUmaRecorder.java", + "base/android/java/src/org/chromium/base/metrics/NoopUmaRecorder.java", + "base/android/java/src/org/chromium/base/metrics/RecordHistogram.java", + "base/android/java/src/org/chromium/base/metrics/RecordUserAction.java", + "base/android/java/src/org/chromium/base/metrics/ScopedSysTraceEvent.java", + "base/android/java/src/org/chromium/base/metrics/StatisticsRecorderAndroid.java", + "base/android/java/src/org/chromium/base/metrics/TimingMetric.java", + "base/android/java/src/org/chromium/base/metrics/UmaRecorder.java", + "base/android/java/src/org/chromium/base/metrics/UmaRecorderHolder.java", + "base/android/java/src/org/chromium/base/multidex/ChromiumMultiDexInstaller.java", + "base/android/java/src/org/chromium/base/process_launcher/BindService.java", + "base/android/java/src/org/chromium/base/process_launcher/ChildConnectionAllocator.java", + "base/android/java/src/org/chromium/base/process_launcher/ChildProcessConnection.java", + "base/android/java/src/org/chromium/base/process_launcher/ChildProcessConstants.java", + "base/android/java/src/org/chromium/base/process_launcher/ChildProcessLauncher.java", + "base/android/java/src/org/chromium/base/process_launcher/ChildProcessServiceDelegate.java", + "base/android/java/src/org/chromium/base/process_launcher/ChildServiceConnection.java", + "base/android/java/src/org/chromium/base/process_launcher/ChildServiceConnectionDelegate.java", + "base/android/java/src/org/chromium/base/process_launcher/ChildServiceConnectionFactory.java", + "base/android/java/src/org/chromium/base/process_launcher/ChildServiceConnectionImpl.java", + "base/android/java/src/org/chromium/base/process_launcher/FileDescriptorInfo.java", + "base/android/java/src/org/chromium/base/supplier/BooleanSupplier.java", + "base/android/java/src/org/chromium/base/supplier/DestroyableObservableSupplier.java", + "base/android/java/src/org/chromium/base/supplier/ObservableSupplier.java", + "base/android/java/src/org/chromium/base/supplier/ObservableSupplierImpl.java", + "base/android/java/src/org/chromium/base/supplier/OneShotCallback.java", + "base/android/java/src/org/chromium/base/supplier/OneshotSupplier.java", + "base/android/java/src/org/chromium/base/supplier/OneshotSupplierImpl.java", + "base/android/java/src/org/chromium/base/supplier/Supplier.java", + "base/android/java/src/org/chromium/base/supplier/UnownedUserDataSupplier.java", + "base/android/java/src/org/chromium/base/task/AsyncTask.java", + "base/android/java/src/org/chromium/base/task/BackgroundOnlyAsyncTask.java", + "base/android/java/src/org/chromium/base/task/ChainedTasks.java", + "base/android/java/src/org/chromium/base/task/ChoreographerTaskRunner.java", + "base/android/java/src/org/chromium/base/task/ChromeThreadPoolExecutor.java", + "base/android/java/src/org/chromium/base/task/DefaultTaskExecutor.java", + "base/android/java/src/org/chromium/base/task/PostTask.java", + "base/android/java/src/org/chromium/base/task/SequencedTaskRunner.java", + "base/android/java/src/org/chromium/base/task/SequencedTaskRunnerImpl.java", + "base/android/java/src/org/chromium/base/task/SerialExecutor.java", + "base/android/java/src/org/chromium/base/task/SingleThreadTaskRunner.java", + "base/android/java/src/org/chromium/base/task/SingleThreadTaskRunnerImpl.java", + "base/android/java/src/org/chromium/base/task/TaskExecutor.java", + "base/android/java/src/org/chromium/base/task/TaskRunner.java", + "base/android/java/src/org/chromium/base/task/TaskRunnerImpl.java", + "base/android/java/src/org/chromium/base/task/TaskTraits.java", + "base/android/java/src/org/chromium/base/task/TaskTraitsExtensionDescriptor.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/api/src/org/chromium/net/BidirectionalStream.java", + "components/cronet/android/api/src/org/chromium/net/CallbackException.java", + "components/cronet/android/api/src/org/chromium/net/CronetEngine.java", + "components/cronet/android/api/src/org/chromium/net/CronetException.java", + "components/cronet/android/api/src/org/chromium/net/CronetProvider.java", + "components/cronet/android/api/src/org/chromium/net/ExperimentalBidirectionalStream.java", + "components/cronet/android/api/src/org/chromium/net/ExperimentalCronetEngine.java", + "components/cronet/android/api/src/org/chromium/net/ExperimentalUrlRequest.java", + "components/cronet/android/api/src/org/chromium/net/ICronetEngineBuilder.java", + "components/cronet/android/api/src/org/chromium/net/InlineExecutionProhibitedException.java", + "components/cronet/android/api/src/org/chromium/net/NetworkException.java", + "components/cronet/android/api/src/org/chromium/net/NetworkQualityRttListener.java", + "components/cronet/android/api/src/org/chromium/net/NetworkQualityThroughputListener.java", + "components/cronet/android/api/src/org/chromium/net/QuicException.java", + "components/cronet/android/api/src/org/chromium/net/RequestFinishedInfo.java", + "components/cronet/android/api/src/org/chromium/net/UploadDataProvider.java", + "components/cronet/android/api/src/org/chromium/net/UploadDataProviders.java", + "components/cronet/android/api/src/org/chromium/net/UploadDataSink.java", + "components/cronet/android/api/src/org/chromium/net/UrlRequest.java", + "components/cronet/android/api/src/org/chromium/net/UrlResponseInfo.java", + "components/cronet/android/api/src/org/chromium/net/apihelpers/ByteArrayCronetCallback.java", + "components/cronet/android/api/src/org/chromium/net/apihelpers/ContentTypeParametersParser.java", + "components/cronet/android/api/src/org/chromium/net/apihelpers/CronetRequestCompletionListener.java", + "components/cronet/android/api/src/org/chromium/net/apihelpers/CronetResponse.java", + "components/cronet/android/api/src/org/chromium/net/apihelpers/ImplicitFlowControlCallback.java", + "components/cronet/android/api/src/org/chromium/net/apihelpers/InMemoryTransformCronetCallback.java", + "components/cronet/android/api/src/org/chromium/net/apihelpers/JsonCronetCallback.java", + "components/cronet/android/api/src/org/chromium/net/apihelpers/RedirectHandler.java", + "components/cronet/android/api/src/org/chromium/net/apihelpers/RedirectHandlers.java", + "components/cronet/android/api/src/org/chromium/net/apihelpers/StringCronetCallback.java", + "components/cronet/android/api/src/org/chromium/net/apihelpers/UploadDataProviders.java", + "components/cronet/android/api/src/org/chromium/net/apihelpers/UrlRequestCallbacks.java", + "components/cronet/android/fake/java/org/chromium/net/test/FakeCronetController.java", + "components/cronet/android/fake/java/org/chromium/net/test/FakeCronetEngine.java", + "components/cronet/android/fake/java/org/chromium/net/test/FakeCronetProvider.java", + "components/cronet/android/fake/java/org/chromium/net/test/FakeUrlRequest.java", + "components/cronet/android/fake/java/org/chromium/net/test/FakeUrlResponse.java", + "components/cronet/android/fake/java/org/chromium/net/test/ResponseMatcher.java", + "components/cronet/android/fake/java/org/chromium/net/test/UrlResponseMatcher.java", + "components/cronet/android/java/src/org/chromium/net/impl/BidirectionalStreamBuilderImpl.java", + "components/cronet/android/java/src/org/chromium/net/impl/BidirectionalStreamNetworkException.java", + "components/cronet/android/java/src/org/chromium/net/impl/CallbackExceptionImpl.java", + "components/cronet/android/java/src/org/chromium/net/impl/CronetBidirectionalStream.java", + "components/cronet/android/java/src/org/chromium/net/impl/CronetEngineBase.java", + "components/cronet/android/java/src/org/chromium/net/impl/CronetEngineBuilderImpl.java", + "components/cronet/android/java/src/org/chromium/net/impl/CronetExceptionImpl.java", + "components/cronet/android/java/src/org/chromium/net/impl/CronetLibraryLoader.java", + "components/cronet/android/java/src/org/chromium/net/impl/CronetLogger.java", + "components/cronet/android/java/src/org/chromium/net/impl/CronetLoggerFactory.java", + "components/cronet/android/java/src/org/chromium/net/impl/CronetManifest.java", + "components/cronet/android/java/src/org/chromium/net/impl/CronetMetrics.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", + "components/cronet/android/java/src/org/chromium/net/impl/InputStreamChannel.java", + "components/cronet/android/java/src/org/chromium/net/impl/JavaCronetEngine.java", + "components/cronet/android/java/src/org/chromium/net/impl/JavaCronetEngineBuilderImpl.java", + "components/cronet/android/java/src/org/chromium/net/impl/JavaCronetProvider.java", + "components/cronet/android/java/src/org/chromium/net/impl/JavaUploadDataSinkBase.java", + "components/cronet/android/java/src/org/chromium/net/impl/JavaUrlRequest.java", + "components/cronet/android/java/src/org/chromium/net/impl/JavaUrlRequestUtils.java", + "components/cronet/android/java/src/org/chromium/net/impl/NativeCronetEngineBuilderImpl.java", + "components/cronet/android/java/src/org/chromium/net/impl/NativeCronetEngineBuilderWithLibraryLoaderImpl.java", + "components/cronet/android/java/src/org/chromium/net/impl/NativeCronetProvider.java", + "components/cronet/android/java/src/org/chromium/net/impl/NetworkExceptionImpl.java", + "components/cronet/android/java/src/org/chromium/net/impl/NoOpLogger.java", + "components/cronet/android/java/src/org/chromium/net/impl/Preconditions.java", + "components/cronet/android/java/src/org/chromium/net/impl/QuicExceptionImpl.java", + "components/cronet/android/java/src/org/chromium/net/impl/RequestFinishedInfoImpl.java", + "components/cronet/android/java/src/org/chromium/net/impl/UrlRequestBase.java", + "components/cronet/android/java/src/org/chromium/net/impl/UrlRequestBuilderImpl.java", + "components/cronet/android/java/src/org/chromium/net/impl/UrlResponseInfoImpl.java", + "components/cronet/android/java/src/org/chromium/net/impl/UserAgent.java", + "components/cronet/android/java/src/org/chromium/net/impl/VersionSafeCallbacks.java", + "components/cronet/android/java/src/org/chromium/net/urlconnection/CronetBufferedOutputStream.java", + "components/cronet/android/java/src/org/chromium/net/urlconnection/CronetChunkedOutputStream.java", + "components/cronet/android/java/src/org/chromium/net/urlconnection/CronetFixedModeOutputStream.java", + "components/cronet/android/java/src/org/chromium/net/urlconnection/CronetHttpURLConnection.java", + "components/cronet/android/java/src/org/chromium/net/urlconnection/CronetHttpURLStreamHandler.java", + "components/cronet/android/java/src/org/chromium/net/urlconnection/CronetInputStream.java", + "components/cronet/android/java/src/org/chromium/net/urlconnection/CronetOutputStream.java", + "components/cronet/android/java/src/org/chromium/net/urlconnection/CronetURLStreamHandlerFactory.java", + "components/cronet/android/java/src/org/chromium/net/urlconnection/MessageLoop.java", + "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/ChromiumNetworkAdapter.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/HttpNegotiateConstants.java", + "net/android/java/src/org/chromium/net/HttpUtil.java", + "net/android/java/src/org/chromium/net/MimeTypeFilter.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/NetworkChangeNotifierAutoDetect.java", + "net/android/java/src/org/chromium/net/NetworkTrafficAnnotationTag.java", + "net/android/java/src/org/chromium/net/ProxyBroadcastReceiver.java", + "net/android/java/src/org/chromium/net/ProxyChangeListener.java", + "net/android/java/src/org/chromium/net/RegistrationPolicyAlwaysRegister.java", + "net/android/java/src/org/chromium/net/RegistrationPolicyApplicationStatus.java", + "net/android/java/src/org/chromium/net/ThreadStatsUid.java", + "net/android/java/src/org/chromium/net/X509Util.java", + "url/android/java/src/org/chromium/url/IDNStringUtil.java", ], cmd: "current_dir=`basename \\`pwd\\``; " + "for f in $(in); " + @@ -4167,7 +4437,276 @@ genrule { genrule { name: "cronet_aml_components_cronet_android_cronet_jni_registration__android_x86_64", srcs: [ + "base/android/java/src/org/chromium/base/ActivityState.java", + "base/android/java/src/org/chromium/base/ApiCompatibilityUtils.java", + "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/ByteArrayGenerator.java", + "base/android/java/src/org/chromium/base/Callback.java", + "base/android/java/src/org/chromium/base/CallbackController.java", + "base/android/java/src/org/chromium/base/CollectionUtil.java", + "base/android/java/src/org/chromium/base/CommandLine.java", + "base/android/java/src/org/chromium/base/CommandLineInitUtil.java", + "base/android/java/src/org/chromium/base/Consumer.java", + "base/android/java/src/org/chromium/base/ContentUriUtils.java", + "base/android/java/src/org/chromium/base/ContextUtils.java", + "base/android/java/src/org/chromium/base/CpuFeatures.java", + "base/android/java/src/org/chromium/base/DiscardableReferencePool.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/Function.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/IntentUtils.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/JniException.java", + "base/android/java/src/org/chromium/base/JniStaticTestMocker.java", + "base/android/java/src/org/chromium/base/LifetimeAssert.java", + "base/android/java/src/org/chromium/base/LocaleUtils.java", + "base/android/java/src/org/chromium/base/Log.java", + "base/android/java/src/org/chromium/base/MathUtils.java", + "base/android/java/src/org/chromium/base/MemoryPressureListener.java", + "base/android/java/src/org/chromium/base/NativeLibraryLoadedStatus.java", + "base/android/java/src/org/chromium/base/ObserverList.java", + "base/android/java/src/org/chromium/base/PackageManagerUtils.java", + "base/android/java/src/org/chromium/base/PackageUtils.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/PiiElider.java", + "base/android/java/src/org/chromium/base/PowerMonitor.java", + "base/android/java/src/org/chromium/base/PowerMonitorForQ.java", + "base/android/java/src/org/chromium/base/Predicate.java", + "base/android/java/src/org/chromium/base/Promise.java", + "base/android/java/src/org/chromium/base/RadioUtils.java", + "base/android/java/src/org/chromium/base/StreamUtil.java", + "base/android/java/src/org/chromium/base/StrictModeContext.java", + "base/android/java/src/org/chromium/base/ThreadUtils.java", + "base/android/java/src/org/chromium/base/TimeUtils.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/UnownedUserData.java", + "base/android/java/src/org/chromium/base/UnownedUserDataHost.java", + "base/android/java/src/org/chromium/base/UnownedUserDataKey.java", + "base/android/java/src/org/chromium/base/UserData.java", + "base/android/java/src/org/chromium/base/UserDataHost.java", + "base/android/java/src/org/chromium/base/WrappedClassLoader.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", + "base/android/java/src/org/chromium/base/compat/ApiHelperForM.java", + "base/android/java/src/org/chromium/base/compat/ApiHelperForN.java", + "base/android/java/src/org/chromium/base/compat/ApiHelperForO.java", + "base/android/java/src/org/chromium/base/compat/ApiHelperForOMR1.java", + "base/android/java/src/org/chromium/base/compat/ApiHelperForP.java", + "base/android/java/src/org/chromium/base/compat/ApiHelperForQ.java", + "base/android/java/src/org/chromium/base/compat/ApiHelperForR.java", + "base/android/java/src/org/chromium/base/compat/ApiHelperForS.java", + "base/android/java/src/org/chromium/base/jank_tracker/DummyJankTracker.java", + "base/android/java/src/org/chromium/base/jank_tracker/FrameMetrics.java", + "base/android/java/src/org/chromium/base/jank_tracker/FrameMetricsListener.java", + "base/android/java/src/org/chromium/base/jank_tracker/FrameMetricsStore.java", + "base/android/java/src/org/chromium/base/jank_tracker/JankActivityTracker.java", + "base/android/java/src/org/chromium/base/jank_tracker/JankMetricCalculator.java", + "base/android/java/src/org/chromium/base/jank_tracker/JankMetricUMARecorder.java", + "base/android/java/src/org/chromium/base/jank_tracker/JankMetrics.java", + "base/android/java/src/org/chromium/base/jank_tracker/JankReportingRunnable.java", + "base/android/java/src/org/chromium/base/jank_tracker/JankReportingScheduler.java", + "base/android/java/src/org/chromium/base/jank_tracker/JankScenario.java", + "base/android/java/src/org/chromium/base/jank_tracker/JankTracker.java", + "base/android/java/src/org/chromium/base/jank_tracker/JankTrackerImpl.java", + "base/android/java/src/org/chromium/base/library_loader/LegacyLinker.java", + "base/android/java/src/org/chromium/base/library_loader/Linker.java", + "base/android/java/src/org/chromium/base/library_loader/LinkerJni.java", + "base/android/java/src/org/chromium/base/library_loader/LoaderErrors.java", + "base/android/java/src/org/chromium/base/library_loader/ModernLinker.java", + "base/android/java/src/org/chromium/base/library_loader/ModernLinkerJni.java", + "base/android/java/src/org/chromium/base/library_loader/NativeLibraryPreloader.java", + "base/android/java/src/org/chromium/base/library_loader/ProcessInitException.java", + "base/android/java/src/org/chromium/base/lifetime/DestroyChecker.java", + "base/android/java/src/org/chromium/base/lifetime/Destroyable.java", + "base/android/java/src/org/chromium/base/memory/JavaHeapDumpGenerator.java", + "base/android/java/src/org/chromium/base/memory/MemoryPressureCallback.java", + "base/android/java/src/org/chromium/base/memory/MemoryPressureMonitor.java", + "base/android/java/src/org/chromium/base/memory/MemoryPressureUma.java", + "base/android/java/src/org/chromium/base/memory/MemoryPurgeManager.java", + "base/android/java/src/org/chromium/base/metrics/CachingUmaRecorder.java", + "base/android/java/src/org/chromium/base/metrics/NativeUmaRecorder.java", + "base/android/java/src/org/chromium/base/metrics/NoopUmaRecorder.java", + "base/android/java/src/org/chromium/base/metrics/RecordHistogram.java", + "base/android/java/src/org/chromium/base/metrics/RecordUserAction.java", + "base/android/java/src/org/chromium/base/metrics/ScopedSysTraceEvent.java", + "base/android/java/src/org/chromium/base/metrics/StatisticsRecorderAndroid.java", + "base/android/java/src/org/chromium/base/metrics/TimingMetric.java", + "base/android/java/src/org/chromium/base/metrics/UmaRecorder.java", + "base/android/java/src/org/chromium/base/metrics/UmaRecorderHolder.java", + "base/android/java/src/org/chromium/base/multidex/ChromiumMultiDexInstaller.java", + "base/android/java/src/org/chromium/base/process_launcher/BindService.java", + "base/android/java/src/org/chromium/base/process_launcher/ChildConnectionAllocator.java", + "base/android/java/src/org/chromium/base/process_launcher/ChildProcessConnection.java", + "base/android/java/src/org/chromium/base/process_launcher/ChildProcessConstants.java", + "base/android/java/src/org/chromium/base/process_launcher/ChildProcessLauncher.java", + "base/android/java/src/org/chromium/base/process_launcher/ChildProcessServiceDelegate.java", + "base/android/java/src/org/chromium/base/process_launcher/ChildServiceConnection.java", + "base/android/java/src/org/chromium/base/process_launcher/ChildServiceConnectionDelegate.java", + "base/android/java/src/org/chromium/base/process_launcher/ChildServiceConnectionFactory.java", + "base/android/java/src/org/chromium/base/process_launcher/ChildServiceConnectionImpl.java", + "base/android/java/src/org/chromium/base/process_launcher/FileDescriptorInfo.java", + "base/android/java/src/org/chromium/base/supplier/BooleanSupplier.java", + "base/android/java/src/org/chromium/base/supplier/DestroyableObservableSupplier.java", + "base/android/java/src/org/chromium/base/supplier/ObservableSupplier.java", + "base/android/java/src/org/chromium/base/supplier/ObservableSupplierImpl.java", + "base/android/java/src/org/chromium/base/supplier/OneShotCallback.java", + "base/android/java/src/org/chromium/base/supplier/OneshotSupplier.java", + "base/android/java/src/org/chromium/base/supplier/OneshotSupplierImpl.java", + "base/android/java/src/org/chromium/base/supplier/Supplier.java", + "base/android/java/src/org/chromium/base/supplier/UnownedUserDataSupplier.java", + "base/android/java/src/org/chromium/base/task/AsyncTask.java", + "base/android/java/src/org/chromium/base/task/BackgroundOnlyAsyncTask.java", + "base/android/java/src/org/chromium/base/task/ChainedTasks.java", + "base/android/java/src/org/chromium/base/task/ChoreographerTaskRunner.java", + "base/android/java/src/org/chromium/base/task/ChromeThreadPoolExecutor.java", + "base/android/java/src/org/chromium/base/task/DefaultTaskExecutor.java", + "base/android/java/src/org/chromium/base/task/PostTask.java", + "base/android/java/src/org/chromium/base/task/SequencedTaskRunner.java", + "base/android/java/src/org/chromium/base/task/SequencedTaskRunnerImpl.java", + "base/android/java/src/org/chromium/base/task/SerialExecutor.java", + "base/android/java/src/org/chromium/base/task/SingleThreadTaskRunner.java", + "base/android/java/src/org/chromium/base/task/SingleThreadTaskRunnerImpl.java", + "base/android/java/src/org/chromium/base/task/TaskExecutor.java", + "base/android/java/src/org/chromium/base/task/TaskRunner.java", + "base/android/java/src/org/chromium/base/task/TaskRunnerImpl.java", + "base/android/java/src/org/chromium/base/task/TaskTraits.java", + "base/android/java/src/org/chromium/base/task/TaskTraitsExtensionDescriptor.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/api/src/org/chromium/net/BidirectionalStream.java", + "components/cronet/android/api/src/org/chromium/net/CallbackException.java", + "components/cronet/android/api/src/org/chromium/net/CronetEngine.java", + "components/cronet/android/api/src/org/chromium/net/CronetException.java", + "components/cronet/android/api/src/org/chromium/net/CronetProvider.java", + "components/cronet/android/api/src/org/chromium/net/ExperimentalBidirectionalStream.java", + "components/cronet/android/api/src/org/chromium/net/ExperimentalCronetEngine.java", + "components/cronet/android/api/src/org/chromium/net/ExperimentalUrlRequest.java", + "components/cronet/android/api/src/org/chromium/net/ICronetEngineBuilder.java", + "components/cronet/android/api/src/org/chromium/net/InlineExecutionProhibitedException.java", + "components/cronet/android/api/src/org/chromium/net/NetworkException.java", + "components/cronet/android/api/src/org/chromium/net/NetworkQualityRttListener.java", + "components/cronet/android/api/src/org/chromium/net/NetworkQualityThroughputListener.java", + "components/cronet/android/api/src/org/chromium/net/QuicException.java", + "components/cronet/android/api/src/org/chromium/net/RequestFinishedInfo.java", + "components/cronet/android/api/src/org/chromium/net/UploadDataProvider.java", + "components/cronet/android/api/src/org/chromium/net/UploadDataProviders.java", + "components/cronet/android/api/src/org/chromium/net/UploadDataSink.java", + "components/cronet/android/api/src/org/chromium/net/UrlRequest.java", + "components/cronet/android/api/src/org/chromium/net/UrlResponseInfo.java", + "components/cronet/android/api/src/org/chromium/net/apihelpers/ByteArrayCronetCallback.java", + "components/cronet/android/api/src/org/chromium/net/apihelpers/ContentTypeParametersParser.java", + "components/cronet/android/api/src/org/chromium/net/apihelpers/CronetRequestCompletionListener.java", + "components/cronet/android/api/src/org/chromium/net/apihelpers/CronetResponse.java", + "components/cronet/android/api/src/org/chromium/net/apihelpers/ImplicitFlowControlCallback.java", + "components/cronet/android/api/src/org/chromium/net/apihelpers/InMemoryTransformCronetCallback.java", + "components/cronet/android/api/src/org/chromium/net/apihelpers/JsonCronetCallback.java", + "components/cronet/android/api/src/org/chromium/net/apihelpers/RedirectHandler.java", + "components/cronet/android/api/src/org/chromium/net/apihelpers/RedirectHandlers.java", + "components/cronet/android/api/src/org/chromium/net/apihelpers/StringCronetCallback.java", + "components/cronet/android/api/src/org/chromium/net/apihelpers/UploadDataProviders.java", + "components/cronet/android/api/src/org/chromium/net/apihelpers/UrlRequestCallbacks.java", + "components/cronet/android/fake/java/org/chromium/net/test/FakeCronetController.java", + "components/cronet/android/fake/java/org/chromium/net/test/FakeCronetEngine.java", + "components/cronet/android/fake/java/org/chromium/net/test/FakeCronetProvider.java", + "components/cronet/android/fake/java/org/chromium/net/test/FakeUrlRequest.java", + "components/cronet/android/fake/java/org/chromium/net/test/FakeUrlResponse.java", + "components/cronet/android/fake/java/org/chromium/net/test/ResponseMatcher.java", + "components/cronet/android/fake/java/org/chromium/net/test/UrlResponseMatcher.java", + "components/cronet/android/java/src/org/chromium/net/impl/BidirectionalStreamBuilderImpl.java", + "components/cronet/android/java/src/org/chromium/net/impl/BidirectionalStreamNetworkException.java", + "components/cronet/android/java/src/org/chromium/net/impl/CallbackExceptionImpl.java", + "components/cronet/android/java/src/org/chromium/net/impl/CronetBidirectionalStream.java", + "components/cronet/android/java/src/org/chromium/net/impl/CronetEngineBase.java", + "components/cronet/android/java/src/org/chromium/net/impl/CronetEngineBuilderImpl.java", + "components/cronet/android/java/src/org/chromium/net/impl/CronetExceptionImpl.java", + "components/cronet/android/java/src/org/chromium/net/impl/CronetLibraryLoader.java", + "components/cronet/android/java/src/org/chromium/net/impl/CronetLogger.java", + "components/cronet/android/java/src/org/chromium/net/impl/CronetLoggerFactory.java", + "components/cronet/android/java/src/org/chromium/net/impl/CronetManifest.java", + "components/cronet/android/java/src/org/chromium/net/impl/CronetMetrics.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", + "components/cronet/android/java/src/org/chromium/net/impl/InputStreamChannel.java", + "components/cronet/android/java/src/org/chromium/net/impl/JavaCronetEngine.java", + "components/cronet/android/java/src/org/chromium/net/impl/JavaCronetEngineBuilderImpl.java", + "components/cronet/android/java/src/org/chromium/net/impl/JavaCronetProvider.java", + "components/cronet/android/java/src/org/chromium/net/impl/JavaUploadDataSinkBase.java", + "components/cronet/android/java/src/org/chromium/net/impl/JavaUrlRequest.java", + "components/cronet/android/java/src/org/chromium/net/impl/JavaUrlRequestUtils.java", + "components/cronet/android/java/src/org/chromium/net/impl/NativeCronetEngineBuilderImpl.java", + "components/cronet/android/java/src/org/chromium/net/impl/NativeCronetEngineBuilderWithLibraryLoaderImpl.java", + "components/cronet/android/java/src/org/chromium/net/impl/NativeCronetProvider.java", + "components/cronet/android/java/src/org/chromium/net/impl/NetworkExceptionImpl.java", + "components/cronet/android/java/src/org/chromium/net/impl/NoOpLogger.java", + "components/cronet/android/java/src/org/chromium/net/impl/Preconditions.java", + "components/cronet/android/java/src/org/chromium/net/impl/QuicExceptionImpl.java", + "components/cronet/android/java/src/org/chromium/net/impl/RequestFinishedInfoImpl.java", + "components/cronet/android/java/src/org/chromium/net/impl/UrlRequestBase.java", + "components/cronet/android/java/src/org/chromium/net/impl/UrlRequestBuilderImpl.java", + "components/cronet/android/java/src/org/chromium/net/impl/UrlResponseInfoImpl.java", + "components/cronet/android/java/src/org/chromium/net/impl/UserAgent.java", + "components/cronet/android/java/src/org/chromium/net/impl/VersionSafeCallbacks.java", + "components/cronet/android/java/src/org/chromium/net/urlconnection/CronetBufferedOutputStream.java", + "components/cronet/android/java/src/org/chromium/net/urlconnection/CronetChunkedOutputStream.java", + "components/cronet/android/java/src/org/chromium/net/urlconnection/CronetFixedModeOutputStream.java", + "components/cronet/android/java/src/org/chromium/net/urlconnection/CronetHttpURLConnection.java", + "components/cronet/android/java/src/org/chromium/net/urlconnection/CronetHttpURLStreamHandler.java", + "components/cronet/android/java/src/org/chromium/net/urlconnection/CronetInputStream.java", + "components/cronet/android/java/src/org/chromium/net/urlconnection/CronetOutputStream.java", + "components/cronet/android/java/src/org/chromium/net/urlconnection/CronetURLStreamHandlerFactory.java", + "components/cronet/android/java/src/org/chromium/net/urlconnection/MessageLoop.java", + "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/ChromiumNetworkAdapter.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/HttpNegotiateConstants.java", + "net/android/java/src/org/chromium/net/HttpUtil.java", + "net/android/java/src/org/chromium/net/MimeTypeFilter.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/NetworkChangeNotifierAutoDetect.java", + "net/android/java/src/org/chromium/net/NetworkTrafficAnnotationTag.java", + "net/android/java/src/org/chromium/net/ProxyBroadcastReceiver.java", + "net/android/java/src/org/chromium/net/ProxyChangeListener.java", + "net/android/java/src/org/chromium/net/RegistrationPolicyAlwaysRegister.java", + "net/android/java/src/org/chromium/net/RegistrationPolicyApplicationStatus.java", + "net/android/java/src/org/chromium/net/ThreadStatsUid.java", + "net/android/java/src/org/chromium/net/X509Util.java", + "url/android/java/src/org/chromium/url/IDNStringUtil.java", ], cmd: "current_dir=`basename \\`pwd\\``; " + "for f in $(in); " + @@ -5134,6 +5673,282 @@ cc_defaults { // GN: //gn:java java_library { name: "cronet_aml_java", + srcs: [ + "base/android/java/src/org/chromium/base/ActivityState.java", + "base/android/java/src/org/chromium/base/ApiCompatibilityUtils.java", + "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/ByteArrayGenerator.java", + "base/android/java/src/org/chromium/base/Callback.java", + "base/android/java/src/org/chromium/base/CallbackController.java", + "base/android/java/src/org/chromium/base/CollectionUtil.java", + "base/android/java/src/org/chromium/base/CommandLine.java", + "base/android/java/src/org/chromium/base/CommandLineInitUtil.java", + "base/android/java/src/org/chromium/base/Consumer.java", + "base/android/java/src/org/chromium/base/ContentUriUtils.java", + "base/android/java/src/org/chromium/base/ContextUtils.java", + "base/android/java/src/org/chromium/base/CpuFeatures.java", + "base/android/java/src/org/chromium/base/DiscardableReferencePool.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/Function.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/IntentUtils.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/JniException.java", + "base/android/java/src/org/chromium/base/JniStaticTestMocker.java", + "base/android/java/src/org/chromium/base/LifetimeAssert.java", + "base/android/java/src/org/chromium/base/LocaleUtils.java", + "base/android/java/src/org/chromium/base/Log.java", + "base/android/java/src/org/chromium/base/MathUtils.java", + "base/android/java/src/org/chromium/base/MemoryPressureListener.java", + "base/android/java/src/org/chromium/base/NativeLibraryLoadedStatus.java", + "base/android/java/src/org/chromium/base/ObserverList.java", + "base/android/java/src/org/chromium/base/PackageManagerUtils.java", + "base/android/java/src/org/chromium/base/PackageUtils.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/PiiElider.java", + "base/android/java/src/org/chromium/base/PowerMonitor.java", + "base/android/java/src/org/chromium/base/PowerMonitorForQ.java", + "base/android/java/src/org/chromium/base/Predicate.java", + "base/android/java/src/org/chromium/base/Promise.java", + "base/android/java/src/org/chromium/base/RadioUtils.java", + "base/android/java/src/org/chromium/base/StreamUtil.java", + "base/android/java/src/org/chromium/base/StrictModeContext.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/TimeUtils.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/UnownedUserData.java", + "base/android/java/src/org/chromium/base/UnownedUserDataHost.java", + "base/android/java/src/org/chromium/base/UnownedUserDataKey.java", + "base/android/java/src/org/chromium/base/UserData.java", + "base/android/java/src/org/chromium/base/UserDataHost.java", + "base/android/java/src/org/chromium/base/WrappedClassLoader.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", + "base/android/java/src/org/chromium/base/compat/ApiHelperForM.java", + "base/android/java/src/org/chromium/base/compat/ApiHelperForN.java", + "base/android/java/src/org/chromium/base/compat/ApiHelperForO.java", + "base/android/java/src/org/chromium/base/compat/ApiHelperForOMR1.java", + "base/android/java/src/org/chromium/base/compat/ApiHelperForP.java", + "base/android/java/src/org/chromium/base/compat/ApiHelperForQ.java", + "base/android/java/src/org/chromium/base/compat/ApiHelperForR.java", + "base/android/java/src/org/chromium/base/compat/ApiHelperForS.java", + "base/android/java/src/org/chromium/base/jank_tracker/DummyJankTracker.java", + "base/android/java/src/org/chromium/base/jank_tracker/FrameMetrics.java", + "base/android/java/src/org/chromium/base/jank_tracker/FrameMetricsListener.java", + "base/android/java/src/org/chromium/base/jank_tracker/FrameMetricsStore.java", + "base/android/java/src/org/chromium/base/jank_tracker/JankActivityTracker.java", + "base/android/java/src/org/chromium/base/jank_tracker/JankMetricCalculator.java", + "base/android/java/src/org/chromium/base/jank_tracker/JankMetricUMARecorder.java", + "base/android/java/src/org/chromium/base/jank_tracker/JankMetrics.java", + "base/android/java/src/org/chromium/base/jank_tracker/JankReportingRunnable.java", + "base/android/java/src/org/chromium/base/jank_tracker/JankReportingScheduler.java", + "base/android/java/src/org/chromium/base/jank_tracker/JankScenario.java", + "base/android/java/src/org/chromium/base/jank_tracker/JankTracker.java", + "base/android/java/src/org/chromium/base/jank_tracker/JankTrackerImpl.java", + "base/android/java/src/org/chromium/base/library_loader/LegacyLinker.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/library_loader/Linker.java", + "base/android/java/src/org/chromium/base/library_loader/LinkerJni.java", + "base/android/java/src/org/chromium/base/library_loader/LoaderErrors.java", + "base/android/java/src/org/chromium/base/library_loader/ModernLinker.java", + "base/android/java/src/org/chromium/base/library_loader/ModernLinkerJni.java", + "base/android/java/src/org/chromium/base/library_loader/NativeLibraryPreloader.java", + "base/android/java/src/org/chromium/base/library_loader/ProcessInitException.java", + "base/android/java/src/org/chromium/base/lifetime/DestroyChecker.java", + "base/android/java/src/org/chromium/base/lifetime/Destroyable.java", + "base/android/java/src/org/chromium/base/memory/JavaHeapDumpGenerator.java", + "base/android/java/src/org/chromium/base/memory/MemoryPressureCallback.java", + "base/android/java/src/org/chromium/base/memory/MemoryPressureMonitor.java", + "base/android/java/src/org/chromium/base/memory/MemoryPressureUma.java", + "base/android/java/src/org/chromium/base/memory/MemoryPurgeManager.java", + "base/android/java/src/org/chromium/base/metrics/CachingUmaRecorder.java", + "base/android/java/src/org/chromium/base/metrics/NativeUmaRecorder.java", + "base/android/java/src/org/chromium/base/metrics/NoopUmaRecorder.java", + "base/android/java/src/org/chromium/base/metrics/RecordHistogram.java", + "base/android/java/src/org/chromium/base/metrics/RecordUserAction.java", + "base/android/java/src/org/chromium/base/metrics/ScopedSysTraceEvent.java", + "base/android/java/src/org/chromium/base/metrics/StatisticsRecorderAndroid.java", + "base/android/java/src/org/chromium/base/metrics/TimingMetric.java", + "base/android/java/src/org/chromium/base/metrics/UmaRecorder.java", + "base/android/java/src/org/chromium/base/metrics/UmaRecorderHolder.java", + "base/android/java/src/org/chromium/base/multidex/ChromiumMultiDexInstaller.java", + "base/android/java/src/org/chromium/base/process_launcher/BindService.java", + "base/android/java/src/org/chromium/base/process_launcher/ChildConnectionAllocator.java", + "base/android/java/src/org/chromium/base/process_launcher/ChildProcessConnection.java", + "base/android/java/src/org/chromium/base/process_launcher/ChildProcessConstants.java", + "base/android/java/src/org/chromium/base/process_launcher/ChildProcessLauncher.java", + "base/android/java/src/org/chromium/base/process_launcher/ChildProcessService.java", + "base/android/java/src/org/chromium/base/process_launcher/ChildProcessServiceDelegate.java", + "base/android/java/src/org/chromium/base/process_launcher/ChildServiceConnection.java", + "base/android/java/src/org/chromium/base/process_launcher/ChildServiceConnectionDelegate.java", + "base/android/java/src/org/chromium/base/process_launcher/ChildServiceConnectionFactory.java", + "base/android/java/src/org/chromium/base/process_launcher/ChildServiceConnectionImpl.java", + "base/android/java/src/org/chromium/base/process_launcher/FileDescriptorInfo.java", + "base/android/java/src/org/chromium/base/supplier/BooleanSupplier.java", + "base/android/java/src/org/chromium/base/supplier/DestroyableObservableSupplier.java", + "base/android/java/src/org/chromium/base/supplier/ObservableSupplier.java", + "base/android/java/src/org/chromium/base/supplier/ObservableSupplierImpl.java", + "base/android/java/src/org/chromium/base/supplier/OneShotCallback.java", + "base/android/java/src/org/chromium/base/supplier/OneshotSupplier.java", + "base/android/java/src/org/chromium/base/supplier/OneshotSupplierImpl.java", + "base/android/java/src/org/chromium/base/supplier/Supplier.java", + "base/android/java/src/org/chromium/base/supplier/UnownedUserDataSupplier.java", + "base/android/java/src/org/chromium/base/task/AsyncTask.java", + "base/android/java/src/org/chromium/base/task/BackgroundOnlyAsyncTask.java", + "base/android/java/src/org/chromium/base/task/ChainedTasks.java", + "base/android/java/src/org/chromium/base/task/ChoreographerTaskRunner.java", + "base/android/java/src/org/chromium/base/task/ChromeThreadPoolExecutor.java", + "base/android/java/src/org/chromium/base/task/DefaultTaskExecutor.java", + "base/android/java/src/org/chromium/base/task/PostTask.java", + "base/android/java/src/org/chromium/base/task/SequencedTaskRunner.java", + "base/android/java/src/org/chromium/base/task/SequencedTaskRunnerImpl.java", + "base/android/java/src/org/chromium/base/task/SerialExecutor.java", + "base/android/java/src/org/chromium/base/task/SingleThreadTaskRunner.java", + "base/android/java/src/org/chromium/base/task/SingleThreadTaskRunnerImpl.java", + "base/android/java/src/org/chromium/base/task/TaskExecutor.java", + "base/android/java/src/org/chromium/base/task/TaskRunner.java", + "base/android/java/src/org/chromium/base/task/TaskRunnerImpl.java", + "base/android/java/src/org/chromium/base/task/TaskTraits.java", + "base/android/java/src/org/chromium/base/task/TaskTraitsExtensionDescriptor.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/api/src/org/chromium/net/BidirectionalStream.java", + "components/cronet/android/api/src/org/chromium/net/CallbackException.java", + "components/cronet/android/api/src/org/chromium/net/CronetEngine.java", + "components/cronet/android/api/src/org/chromium/net/CronetException.java", + "components/cronet/android/api/src/org/chromium/net/CronetProvider.java", + "components/cronet/android/api/src/org/chromium/net/ExperimentalBidirectionalStream.java", + "components/cronet/android/api/src/org/chromium/net/ExperimentalCronetEngine.java", + "components/cronet/android/api/src/org/chromium/net/ExperimentalUrlRequest.java", + "components/cronet/android/api/src/org/chromium/net/ICronetEngineBuilder.java", + "components/cronet/android/api/src/org/chromium/net/InlineExecutionProhibitedException.java", + "components/cronet/android/api/src/org/chromium/net/NetworkException.java", + "components/cronet/android/api/src/org/chromium/net/NetworkQualityRttListener.java", + "components/cronet/android/api/src/org/chromium/net/NetworkQualityThroughputListener.java", + "components/cronet/android/api/src/org/chromium/net/QuicException.java", + "components/cronet/android/api/src/org/chromium/net/RequestFinishedInfo.java", + "components/cronet/android/api/src/org/chromium/net/UploadDataProvider.java", + "components/cronet/android/api/src/org/chromium/net/UploadDataProviders.java", + "components/cronet/android/api/src/org/chromium/net/UploadDataSink.java", + "components/cronet/android/api/src/org/chromium/net/UrlRequest.java", + "components/cronet/android/api/src/org/chromium/net/UrlResponseInfo.java", + "components/cronet/android/api/src/org/chromium/net/apihelpers/ByteArrayCronetCallback.java", + "components/cronet/android/api/src/org/chromium/net/apihelpers/ContentTypeParametersParser.java", + "components/cronet/android/api/src/org/chromium/net/apihelpers/CronetRequestCompletionListener.java", + "components/cronet/android/api/src/org/chromium/net/apihelpers/CronetResponse.java", + "components/cronet/android/api/src/org/chromium/net/apihelpers/ImplicitFlowControlCallback.java", + "components/cronet/android/api/src/org/chromium/net/apihelpers/InMemoryTransformCronetCallback.java", + "components/cronet/android/api/src/org/chromium/net/apihelpers/JsonCronetCallback.java", + "components/cronet/android/api/src/org/chromium/net/apihelpers/RedirectHandler.java", + "components/cronet/android/api/src/org/chromium/net/apihelpers/RedirectHandlers.java", + "components/cronet/android/api/src/org/chromium/net/apihelpers/StringCronetCallback.java", + "components/cronet/android/api/src/org/chromium/net/apihelpers/UploadDataProviders.java", + "components/cronet/android/api/src/org/chromium/net/apihelpers/UrlRequestCallbacks.java", + "components/cronet/android/fake/java/org/chromium/net/test/FakeCronetController.java", + "components/cronet/android/fake/java/org/chromium/net/test/FakeCronetEngine.java", + "components/cronet/android/fake/java/org/chromium/net/test/FakeCronetProvider.java", + "components/cronet/android/fake/java/org/chromium/net/test/FakeUrlRequest.java", + "components/cronet/android/fake/java/org/chromium/net/test/FakeUrlResponse.java", + "components/cronet/android/fake/java/org/chromium/net/test/ResponseMatcher.java", + "components/cronet/android/fake/java/org/chromium/net/test/UrlResponseMatcher.java", + "components/cronet/android/java/src/org/chromium/net/impl/BidirectionalStreamBuilderImpl.java", + "components/cronet/android/java/src/org/chromium/net/impl/BidirectionalStreamNetworkException.java", + "components/cronet/android/java/src/org/chromium/net/impl/CallbackExceptionImpl.java", + "components/cronet/android/java/src/org/chromium/net/impl/CronetBidirectionalStream.java", + "components/cronet/android/java/src/org/chromium/net/impl/CronetEngineBase.java", + "components/cronet/android/java/src/org/chromium/net/impl/CronetEngineBuilderImpl.java", + "components/cronet/android/java/src/org/chromium/net/impl/CronetExceptionImpl.java", + "components/cronet/android/java/src/org/chromium/net/impl/CronetLibraryLoader.java", + "components/cronet/android/java/src/org/chromium/net/impl/CronetLogger.java", + "components/cronet/android/java/src/org/chromium/net/impl/CronetLoggerFactory.java", + "components/cronet/android/java/src/org/chromium/net/impl/CronetManifest.java", + "components/cronet/android/java/src/org/chromium/net/impl/CronetMetrics.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", + "components/cronet/android/java/src/org/chromium/net/impl/InputStreamChannel.java", + "components/cronet/android/java/src/org/chromium/net/impl/JavaCronetEngine.java", + "components/cronet/android/java/src/org/chromium/net/impl/JavaCronetEngineBuilderImpl.java", + "components/cronet/android/java/src/org/chromium/net/impl/JavaCronetProvider.java", + "components/cronet/android/java/src/org/chromium/net/impl/JavaUploadDataSinkBase.java", + "components/cronet/android/java/src/org/chromium/net/impl/JavaUrlRequest.java", + "components/cronet/android/java/src/org/chromium/net/impl/JavaUrlRequestUtils.java", + "components/cronet/android/java/src/org/chromium/net/impl/NativeCronetEngineBuilderImpl.java", + "components/cronet/android/java/src/org/chromium/net/impl/NativeCronetEngineBuilderWithLibraryLoaderImpl.java", + "components/cronet/android/java/src/org/chromium/net/impl/NativeCronetProvider.java", + "components/cronet/android/java/src/org/chromium/net/impl/NetworkExceptionImpl.java", + "components/cronet/android/java/src/org/chromium/net/impl/NoOpLogger.java", + "components/cronet/android/java/src/org/chromium/net/impl/Preconditions.java", + "components/cronet/android/java/src/org/chromium/net/impl/QuicExceptionImpl.java", + "components/cronet/android/java/src/org/chromium/net/impl/RequestFinishedInfoImpl.java", + "components/cronet/android/java/src/org/chromium/net/impl/UrlRequestBase.java", + "components/cronet/android/java/src/org/chromium/net/impl/UrlRequestBuilderImpl.java", + "components/cronet/android/java/src/org/chromium/net/impl/UrlResponseInfoImpl.java", + "components/cronet/android/java/src/org/chromium/net/impl/UserAgent.java", + "components/cronet/android/java/src/org/chromium/net/impl/VersionSafeCallbacks.java", + "components/cronet/android/java/src/org/chromium/net/urlconnection/CronetBufferedOutputStream.java", + "components/cronet/android/java/src/org/chromium/net/urlconnection/CronetChunkedOutputStream.java", + "components/cronet/android/java/src/org/chromium/net/urlconnection/CronetFixedModeOutputStream.java", + "components/cronet/android/java/src/org/chromium/net/urlconnection/CronetHttpURLConnection.java", + "components/cronet/android/java/src/org/chromium/net/urlconnection/CronetHttpURLStreamHandler.java", + "components/cronet/android/java/src/org/chromium/net/urlconnection/CronetInputStream.java", + "components/cronet/android/java/src/org/chromium/net/urlconnection/CronetOutputStream.java", + "components/cronet/android/java/src/org/chromium/net/urlconnection/CronetURLStreamHandlerFactory.java", + "components/cronet/android/java/src/org/chromium/net/urlconnection/MessageLoop.java", + "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/ChromiumNetworkAdapter.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/HttpNegotiateConstants.java", + "net/android/java/src/org/chromium/net/HttpUtil.java", + "net/android/java/src/org/chromium/net/MimeTypeFilter.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/NetworkChangeNotifierAutoDetect.java", + "net/android/java/src/org/chromium/net/NetworkTrafficAnnotationTag.java", + "net/android/java/src/org/chromium/net/ProxyBroadcastReceiver.java", + "net/android/java/src/org/chromium/net/ProxyChangeListener.java", + "net/android/java/src/org/chromium/net/RegistrationPolicyAlwaysRegister.java", + "net/android/java/src/org/chromium/net/RegistrationPolicyApplicationStatus.java", + "net/android/java/src/org/chromium/net/ThreadStatsUid.java", + "net/android/java/src/org/chromium/net/X509Util.java", + "url/android/java/src/org/chromium/url/IDNStringUtil.java", + ], } // GN: //net/base/registry_controlled_domains:registry_controlled_domains__android_x86 @@ -6491,7 +7306,6 @@ cc_library_static { "third_party/zlib/", ], cpp_std: "c++20", - rtti: true, target: { android_x86: { srcs: [ @@ -10734,6 +11548,8 @@ cc_binary { "third_party/protobuf/src/google/protobuf/compiler/main.cc", ], static_libs: [ + "cronet_aml_buildtools_third_party_libc___libc__", + "cronet_aml_buildtools_third_party_libc__abi_libc__abi", "cronet_aml_third_party_protobuf_protobuf_full", "cronet_aml_third_party_protobuf_protoc_lib", "cronet_aml_third_party_zlib_zlib", @@ -10741,9 +11557,6 @@ cc_binary { host_supported: true, device_supported: false, defaults: [ - "cronet_aml_buildtools_third_party_libc___libc__", - "cronet_aml_buildtools_third_party_libc__abi_libc__abi", - "cronet_aml_buildtools_third_party_libunwind_libunwind", "cronet_aml_defaults", ], cflags: [ @@ -10756,8 +11569,6 @@ cc_binary { "-DGOOGLE_PROTOBUF_NO_RTTI", "-DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER", "-DHAVE_PTHREAD", - "-DLIBCXXABI_SILENT_TERMINATE", - "-DLIBCXX_BUILDING_LIBCXXABI", "-DUSE_AURA=1", "-DUSE_OZONE=1", "-DUSE_UDEV", @@ -10767,26 +11578,18 @@ cc_binary { "-D_LARGEFILE64_SOURCE", "-D_LARGEFILE_SOURCE", "-D_LIBCPP_AVAILABILITY_CUSTOM_VERBOSE_ABORT_PROVIDED=1", - "-D_LIBCPP_BUILDING_LIBRARY", - "-D_LIBCPP_CONSTINIT=constinit", "-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS", "-D_LIBCPP_ENABLE_ASSERTIONS_DEFAULT=1", - "-D_LIBCPP_OVERRIDABLE_FUNC_VIS=__attribute__((__visibility__(\"default\")))", "-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS", ], local_include_dirs: [ "./", "buildtools/third_party/libc++/", "buildtools/third_party/libc++/trunk/include", - "buildtools/third_party/libc++/trunk/src/", "buildtools/third_party/libc++abi/trunk/include", "third_party/protobuf/src/", ], cpp_std: "c++20", - cppflags: [ - "-fexceptions", - ], - rtti: true, } // GN: //third_party/protobuf:protoc_lib diff --git a/tools/gn2bp/gen_android_bp b/tools/gn2bp/gen_android_bp index 3d98ce6aac..70e4466706 100755 --- a/tools/gn2bp/gen_android_bp +++ b/tools/gn2bp/gen_android_bp @@ -127,9 +127,6 @@ additional_args = { 'cronet_aml_net_third_party_quiche_quiche', 'cronet_aml_crypto_crypto', }), - # When a code is compiled under rtti(cronet) that depends on another code(net) - # that doesn't depend on rtti. undefined symbol: typeinfo 'class' errors appears. - ('rtti', True), # go/undefined-symbol-typeinfo ], } @@ -967,8 +964,6 @@ def set_module_flags(module, cflags, defines): for flag in cflags: if '-std=' in flag: module.cpp_std = flag[len('-std='):] - if '-frtti' in flag: - module.rtti = True if '-fexceptions' in flag: module.cppflags.add('-fexceptions') @@ -1072,6 +1067,8 @@ def create_modules_from_target(blueprint, gn, gn_target_name): for src in arch.sources if is_supported_source_file(src) and not src.startswith("//out/test")) + module.rtti = target.rtti + if target.type in gn_utils.LINKER_UNIT_TYPES: set_module_flags(module, target.cflags, target.defines) set_module_include_dirs(module, target.cflags, target.include_dirs) diff --git a/tools/gn2bp/gn_utils.py b/tools/gn2bp/gn_utils.py index 2df1c6d845..8543c1249a 100644 --- a/tools/gn2bp/gn_utils.py +++ b/tools/gn2bp/gn_utils.py @@ -36,8 +36,9 @@ ODR_VIOLATION_IGNORE_TARGETS = { '//test/cts:perfetto_cts_deps', '//:perfetto_integrationtests', } - - +ARCH_REGEX = r'(android_x86_64|android_x86|android_arm|android_arm64|host)' +DEX_REGEX = '.*__dex__%s$' % ARCH_REGEX +COMPILE_JAVA_REGEX = '.*__compile_java__%s$' % ARCH_REGEX def repo_root(): """Returns an absolute path to the repository root.""" return os.path.join( @@ -144,6 +145,7 @@ class GnParser(object): self.source_set_deps = set() # Transitive set of source_set deps. self.proto_deps = set() self.transitive_proto_deps = set() + self.rtti = False # TODO: come up with a better way to only run this once. # is_finalized tracks whether finalize() was called on this target. @@ -346,7 +348,10 @@ class GnParser(object): target.ldflags.update(desc.get('ldflags', [])) target.arch[arch].defines.update(desc.get('defines', [])) target.arch[arch].include_dirs.update(desc.get('include_dirs', [])) - + if "-frtti" in target.arch[arch].cflags: + target.rtti = True + if target.type == "source_set": + target.type = "static_library" # Recurse in dependencies. for gn_dep_name in desc.get('deps', []): dep = self.parse_gn_desc(gn_desc, gn_dep_name) @@ -357,6 +362,9 @@ class GnParser(object): target.transitive_proto_deps.update(dep.transitive_proto_deps) elif dep.type == 'source_set': target.source_set_deps.add(dep.name) + if "-frtti" in target.arch[arch].cflags: + # This must not be propagated upward as it effects all of the dependencies + target.arch[arch].cflags -= {"-frtti"} target.update(dep, arch) # Bubble up source set's cflags/ldflags etc. elif dep.type == 'group': target.update(dep, arch) # Bubble up groups's cflags/ldflags etc. @@ -369,6 +377,7 @@ class GnParser(object): # Explicitly break dependency chain when a java_group is added. # Java sources are collected and eventually compiled as one large # java_library. + #print(dep.name, target.deps) pass if dep.type == 'static_library': @@ -387,10 +396,11 @@ class GnParser(object): # dependency of the __dex target) # Note: this skips prebuilt java dependencies. These will have to be # added manually when building the jar. - if re.match('.*__dex$', target.name): - if re.match('.*__compile_java$', dep.name): + if re.match(DEX_REGEX, target.name): + if re.match(COMPILE_JAVA_REGEX, dep.name): log.debug('Adding java sources for %s', dep.name) - java_srcs = [src for src in dep.inputs if os.path.splitext(src)[1] == '.java'] + java_srcs = [src for src in dep.inputs + if os.path.splitext(src)[1] == '.java' and not src.startswith("//out/test/gen/")] self.java_sources.update(java_srcs) return target diff --git a/tools/gn2bp/update_results.sh b/tools/gn2bp/update_results.sh index c428f4ea36..37c355c59e 100755 --- a/tools/gn2bp/update_results.sh +++ b/tools/gn2bp/update_results.sh @@ -13,6 +13,7 @@ set -eux TARGETS=( "//components/cronet/android:cronet" + "//components/cronet:cronet_package" ) BASEDIR=$(dirname "$0")