commit | fc9a262846bed19b10c6b676a18b24d893cb333b | [log] [tgz] |
---|---|---|
author | Maksim Sisov <msisov@igalia.com> | Tue Aug 18 20:20:42 2020 |
committer | Commit Bot <commit-bot@chromium.org> | Tue Aug 18 20:20:42 2020 |
tree | ed1f88c316c1adad69cad6829b33296e8ccfdc73 | |
parent | 4c05ba562839a3bbccf04676dfaacbd5d6047ece [diff] |
X11 and Ozone: fix use_x11 && use_x11 build for UIControlsAura When use_x11 && use_ozone are set to true at the same time, compiler throws an error about multiple definitions of the CreateUIControlsAura. Thus, to fix that, create a separate source file for is_linux case that will choose what class to use based on the IsUsingOzonePlatform feature flag. Please note that this is a temp solution and it will be removed once use_x11 goes away. PS: this patch uses the same approach used in other patches. For example, https://crrev.com/c/2247719 PPS: I didn't spot that in the beginning as linux-rel bot couldn't compile use_x11 && use_ozone because of failures in the chrome installer step. But after we fixed the sysroot, I spotted some problems and fixing them now. Bug: 1085700 Change-Id: I1c2f3a0762df4b195775d30f580df09090f13999 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2362698 Reviewed-by: Scott Violet <sky@chromium.org> Commit-Queue: Maksim Sisov (GMT+3) <msisov@igalia.com> Cr-Commit-Position: refs/heads/master@{#799289}
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 .
For historical reasons, there are some small top level directories. Now the guidance is that new top level directories are for product (e.g. Chrome, Android WebView, Ash). Even if these products have multiple executables, the code should be in subdirectories of the product.