Commit e8d5c5c4 by Frank Henigman Committed by Commit Bot

Check ozone_platform_gbm before doing gbm stuff.

Just checking use_ozone fails when building an ozone platform which doesn't have gbm, e.g. chromecast. BUG=angleproject:1439 CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:linux_chromium_gn_chromeos_rel;tryserver.chromium.android:android_compile_dbg Change-Id: Idec14441ce30dd872b3bfddfe844abfeb910cc02 Reviewed-on: https://chromium-review.googlesource.com/358860Reviewed-by: 's avatarLuke Halliwell <halliwell@chromium.org> Reviewed-by: 's avatarCorentin Wallez <cwallez@chromium.org> Commit-Queue: Frank Henigman <fjhenigman@chromium.org>
parent 8bad46d4
...@@ -7,8 +7,9 @@ import("//build/config/dcheck_always_on.gni") ...@@ -7,8 +7,9 @@ import("//build/config/dcheck_always_on.gni")
import("//build/config/linux/pkg_config.gni") import("//build/config/linux/pkg_config.gni")
import("//build/config/ui.gni") import("//build/config/ui.gni")
import("//third_party/angle/build/angle_common.gni") import("//third_party/angle/build/angle_common.gni")
import("//ui/ozone/ozone.gni")
if (use_ozone) { if (ozone_platform_gbm) {
pkg_config("libdrm") { pkg_config("libdrm") {
packages = [ "libdrm" ] packages = [ "libdrm" ]
} }
...@@ -374,7 +375,7 @@ static_library("libANGLE") { ...@@ -374,7 +375,7 @@ static_library("libANGLE") {
"log", "log",
] ]
} }
if (use_ozone) { if (ozone_platform_gbm) {
configs += [ ":libdrm" ] configs += [ ":libdrm" ]
defines += [ "ANGLE_USE_OZONE" ] defines += [ "ANGLE_USE_OZONE" ]
deps += [ "//third_party/minigbm" ] deps += [ "//third_party/minigbm" ]
......
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