Commit e1ac59e4 authored by tonikitoo's avatar tonikitoo Committed by Commit bot

Fix 'chrome' build when use_ozone is true

As is, the 'chrome' target depends on libsecret, which
explicitly depends on glib.
In case of use_ozone=true builds, though, use_glib is
set to false.

CL fixes it by not building libsecret dependant files
when use_ozone is true.

Review-Url: https://codereview.chromium.org/2341773004
Cr-Commit-Position: refs/heads/master@{#418663}
parent 3e9481d0
...@@ -3432,7 +3432,7 @@ split_static_library("browser") { ...@@ -3432,7 +3432,7 @@ split_static_library("browser") {
} }
if (is_desktop_linux) { if (is_desktop_linux) {
# Desktop linux, doesn"t count ChromeOS. # Desktop linux, doesn't count ChromeOS.
sources += [ sources += [
"first_run/upgrade_util.cc", "first_run/upgrade_util.cc",
"first_run/upgrade_util_linux.cc", "first_run/upgrade_util_linux.cc",
...@@ -3442,8 +3442,6 @@ split_static_library("browser") { ...@@ -3442,8 +3442,6 @@ split_static_library("browser") {
"media/webrtc/window_icon_util_x11.cc", "media/webrtc/window_icon_util_x11.cc",
"password_manager/native_backend_kwallet_x.cc", "password_manager/native_backend_kwallet_x.cc",
"password_manager/native_backend_kwallet_x.h", "password_manager/native_backend_kwallet_x.h",
"password_manager/native_backend_libsecret.cc",
"password_manager/native_backend_libsecret.h",
"platform_util_linux.cc", "platform_util_linux.cc",
"shell_integration_linux.cc", "shell_integration_linux.cc",
"shell_integration_linux.h", "shell_integration_linux.h",
...@@ -3452,8 +3450,14 @@ split_static_library("browser") { ...@@ -3452,8 +3450,14 @@ split_static_library("browser") {
"themes/theme_service_aurax11.h", "themes/theme_service_aurax11.h",
"web_applications/web_app_linux.cc", "web_applications/web_app_linux.cc",
] ]
defines += [ "USE_LIBSECRET" ] if (!use_ozone) {
deps += [ "//third_party/libsecret" ] sources += [
"password_manager/native_backend_libsecret.cc",
"password_manager/native_backend_libsecret.h",
]
defines += [ "USE_LIBSECRET" ]
deps += [ "//third_party/libsecret" ]
}
} }
if (enable_plugin_installation) { if (enable_plugin_installation) {
......
...@@ -4324,7 +4324,7 @@ test("unit_tests") { ...@@ -4324,7 +4324,7 @@ test("unit_tests") {
"//components/os_crypt:gnome_keyring_direct", "//components/os_crypt:gnome_keyring_direct",
] ]
} }
if (is_linux && !is_chromeos) { if (is_linux && !is_chromeos && !use_ozone) {
sources += sources +=
[ "../browser/password_manager/native_backend_libsecret_unittest.cc" ] [ "../browser/password_manager/native_backend_libsecret_unittest.cc" ]
deps += [ "//third_party/libsecret" ] deps += [ "//third_party/libsecret" ]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment