Google Git
Sign in
chromium / chromium / src.git / 11c1d9822b6e35d267e5f7365f6648486b9fc34a
commit11c1d9822b6e35d267e5f7365f6648486b9fc34a[log] [tgz]
authorThomas Anderson <[email protected]>Tue Jan 15 06:32:59 2019
committerCommit Bot <[email protected]>Tue Jan 15 06:32:59 2019
tree243c40fbc3e0251a457072707f53103f6c5f3b5c
parentdfc22b6813741d7ca31a5c0debe2201bb553b483 [diff]
Revert "Fix Android ASAN tests when is_component_build=false,use_custom_libcxx=true"

This reverts commit 3c2bf8b54d7eaad31ce27e11f8a3a43d06168481.

Reason for revert: No longer necessary after https://chromium-review.googlesource.com/c/chromium/src/+/1409558

Original change's description:
> Fix Android ASAN tests when is_component_build=false,use_custom_libcxx=true
> 
> The issue with libc++/Android/ASAN/static builds is that
> export_libcxxabi_from_executables gets set to true:
> 
> export_libcxxabi_from_executables =
>     use_custom_libcxx && !is_component_build && (is_asan || is_ubsan_vptr)
> 
> But certain Android tests are built as shared libraries that get loaded from the
> Java runtime.  In this case, there is no main executable to export libc++abi
> from, so symbols will be missing leading to errors like this:
> 
> E/AndroidRuntime( 2103): java.lang.UnsatisfiedLinkError: dlopen failed: cannot
> locate symbol "__cxa_guard_acquire" referenced by
> "lib_cronet_unittests_android__library.so"...
> 
> To fix this, export libc++abi from the test shared library instead, since that's
> the "main DSO" in this case.  Perhaps in the future
> export_libcxxabi_from_executables should be renamed to
> export_libcxxabi_from_main_dso.
> 
> Depends on Angle CL:
> https://chromium-review.googlesource.com/c/angle/angle/+/1405908
> 
> BUG=916973
> R=​thakis
> TBR=dpranke
> 
> Change-Id: I71e4ff5a2998b18fecb9df6628e3c17f88332bf2
> Reviewed-on: https://chromium-review.googlesource.com/c/1405277
> Reviewed-by: Thomas Anderson <[email protected]>
> Reviewed-by: Nico Weber <[email protected]>
> Commit-Queue: Thomas Anderson <[email protected]>
> Cr-Commit-Position: refs/heads/master@{#621861}

[email protected],[email protected]

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 916973
Change-Id: I42c6490ee7fd72b062b5a6ba5c8d954f89db051a
Reviewed-on: https://chromium-review.googlesource.com/c/1410267
Reviewed-by: Thomas Anderson <[email protected]>
Reviewed-by: Nico Weber <[email protected]>
Commit-Queue: Thomas Anderson <[email protected]>
Cr-Commit-Position: refs/heads/master@{#622757}
1 file changed
tree: 243c40fbc3e0251a457072707f53103f6c5f3b5c
  1. android_webview/
  2. apps/
  3. ash/
  4. base/
  5. build/
  6. build_overrides/
  7. cc/
  8. chrome/
  9. chrome_elf/
  10. chromecast/
  11. chromeos/
  12. cloud_print/
  13. components/
  14. content/
  15. courgette/
  16. crypto/
  17. dbus/
  18. device/
  19. docs/
  20. extensions/
  21. gin/
  22. google_apis/
  23. google_update/
  24. gpu/
  25. headless/
  26. infra/
  27. ios/
  28. ipc/
  29. jingle/
  30. mash/
  31. media/
  32. mojo/
  33. native_client_sdk/
  34. net/
  35. pdf/
  36. ppapi/
  37. printing/
  38. remoting/
  39. rlz/
  40. sandbox/
  41. services/
  42. skia/
  43. sql/
  44. storage/
  45. styleguide/
  46. testing/
  47. third_party/
  48. tools/
  49. ui/
  50. url/
  51. webrunner/
  52. .clang-format
  53. .eslintrc.js
  54. .git-blame-ignore-revs
  55. .gitattributes
  56. .gitignore
  57. .gn
  58. .vpython
  59. AUTHORS
  60. BUILD.gn
  61. CODE_OF_CONDUCT.md
  62. codereview.settings
  63. DEPS
  64. ENG_REVIEW_OWNERS
  65. LICENSE
  66. LICENSE.chromium_os
  67. OWNERS
  68. PRESUBMIT.py
  69. PRESUBMIT_test.py
  70. PRESUBMIT_test_mocks.py
  71. README.md
  72. WATCHLISTS
README.md

Logo Chromium

Chromium is an open-source browser project that aims to build a safer, faster, and more stable way for all users to experience the web.

The project's web site is https://www.chromium.org.

Documentation in the source is rooted in docs/README.md.

Learn how to Get Around the Chromium Source Code Directory Structure .