commit a748a57e636985e7a30db44be8b935beddb92560
author C Stout <cstout@google.com> Wed Mar 20 16:49:56 2024 -0700
committer CQ Bot <fuchsia-internal-scoped@luci-project-accounts.iam.gserviceaccount.com> Mon Apr 15 21:10:04 2024 +0000
tree 9a4c3979c810357b18968d28673ac2fd5b2ada1b
parent 00ccc09cd695bf9dad5ff82ec36b6e30985e478f

GN build: replace variables from magma.gni with GN paths

Reduces dependencies on magma.gni

Change-Id: I01648f5f23a3c45877e65ae31085ff86fb471a3a
Reviewed-on: https://fuchsia-review.googlesource.com/c/third_party/mesa/+/1010495
Reviewed-by: John Bauman <jbauman@google.com>
Commit-Queue: Craig Stout <cstout@google.com>

mesa.gni

diff --git a/mesa.gni b/mesa.gni
index e6948d0..485b562 100644
--- a/mesa.gni
+++ b/mesa.gni
@@ -20,7 +20,6 @@
 # IN THE SOFTWARE.
 
 import("//build/python/python_binary.gni")
-import("//src/graphics/lib/magma/gnbuild/magma.gni")
 import("//third_party/mako/py_srcs.gni")
 
 mesa_build_root = "//third_party/mesa"

src/gbm/BUILD.gn

diff --git a/src/gbm/BUILD.gn b/src/gbm/BUILD.gn
index 1999033..3b297b0 100644
--- a/src/gbm/BUILD.gn
+++ b/src/gbm/BUILD.gn
@@ -19,7 +19,7 @@
   ]
 
   deps = [
-    "$magma_build_root/src/libmagma_virt",
+    "//src/graphics/lib/magma/src/libmagma_virt",
   ]
 
   cflags_c = [ "-Wno-strict-prototypes" ]

src/intel/common/BUILD.gn

diff --git a/src/intel/common/BUILD.gn b/src/intel/common/BUILD.gn
index f933d6f..6679a1c 100644
--- a/src/intel/common/BUILD.gn
+++ b/src/intel/common/BUILD.gn
@@ -67,7 +67,7 @@
     # Don't depend on libmagma here, do that on executable targets only
     "$mesa_build_root/src:sha1",
     "$mesa_build_root/src/util",
-    "$msd_intel_gen_build_root/include",
+    "//src/graphics/drivers/msd-intel-gen/include",
     "//sdk/lib/magma_client:magma_headers",
   ]
 

src/intel/vulkan/BUILD.gn

diff --git a/src/intel/vulkan/BUILD.gn b/src/intel/vulkan/BUILD.gn
index dc2bad4f..22a38b4 100644
--- a/src/intel/vulkan/BUILD.gn
+++ b/src/intel/vulkan/BUILD.gn
@@ -20,6 +20,7 @@
 # IN THE SOFTWARE.
 
 import("../../../mesa.gni")
+import("//src/graphics/lib/magma/gnbuild/magma.gni")
 
 declare_args() {
   # TODO(https://fxbug.dev/42146493) - remove once external sync FD extensions fully supported
@@ -78,16 +79,16 @@
 
   if (is_fuchsia) {
     imported_symbols_allowlist =
-        rebase_path("$magma_build_root/gnbuild/imported_symbols.allowlist")
+        rebase_path("//src/graphics/lib/magma/gnbuild/imported_symbols.allowlist")
     deps += [
-      "$magma_build_root/src/libmagma",
+      "//src/graphics/lib/magma/src/libmagma",
       # TODO(fxb/13095); enable this when fx logger failure case is handled
       #"$mesa_build_root/src/os:fuchsia_libc_static",
     ]
   }
 
   if (is_linux) {
-    deps += [ "$magma_build_root/src/libmagma_virt" ]
+    deps += [ "//src/graphics/lib/magma/src/libmagma_virt" ]
   }
 
   configs = [ ":vulkan_icd_config" ]
@@ -130,7 +131,7 @@
     "$mesa_build_root/src/util:magma_util",
     "$mesa_build_root/src/vulkan/runtime",
     "$mesa_build_root/src/vulkan/util",
-    "$msd_intel_gen_build_root/include",
+    "//src/graphics/drivers/msd-intel-gen/include",
     "//sdk/lib/magma_client:magma_headers",
   ]
 

tests/BUILD.gn

diff --git a/tests/BUILD.gn b/tests/BUILD.gn
index 21142c4..e1e78d7 100644
--- a/tests/BUILD.gn
+++ b/tests/BUILD.gn
@@ -37,7 +37,7 @@
   sources = [ "main.cc" ]
 
   deps = [
-    "$magma_build_root/src/libmagma",
+    "//src/graphics/lib/magma/src/libmagma",
     "$mesa_build_root/src/util/tests/futex",
     "$mesa_build_root/src/util/tests/inflight_list",
     "$mesa_build_root/src/util/tests/os_dirent",
@@ -54,7 +54,7 @@
   sources = [ "main.cc" ]
 
   deps = [
-    "$magma_build_root/src/libmagma",
+    "//src/graphics/lib/magma/src/libmagma",
     "$mesa_build_root/src/util/tests/magma_wait",
     "//third_party/googletest:gtest",
   ]