commit 3428a89deeae150a81b5f1ad67d02e3e4c5fa9ca
author C Stout <cstout@google.com> Mon Oct 04 09:30:01 2021 -0700
committer Craig Stout <cstout@google.com> Mon Oct 04 16:31:37 2021 +0000
tree 32308f9d8787ae168b2225b25412ecd02f66ce22
parent 679657996f6a455d00c68f739431c5a95c16fe1f

[magma] Fix header include path

Change-Id: I2eb7f046bebf53b99727fc707066e23c7609df20

fuchsia/BUILD.gn

diff --git a/fuchsia/BUILD.gn b/fuchsia/BUILD.gn
index 1eb978d..78734ff 100644
--- a/fuchsia/BUILD.gn
+++ b/fuchsia/BUILD.gn
@@ -40,7 +40,7 @@
   public_configs = [ ":va-magma-config" ]
   public_deps = [
     ":libva-magma-resource",
-    "//src/graphics/lib/magma/include:magma_abi",
+    "//src/graphics/lib/magma/include:magma",
   ]
 }
 

fuchsia/meson/fake-pkg-config.py

diff --git a/fuchsia/meson/fake-pkg-config.py b/fuchsia/meson/fake-pkg-config.py
index a7dd91e..feabc29 100755
--- a/fuchsia/meson/fake-pkg-config.py
+++ b/fuchsia/meson/fake-pkg-config.py
@@ -26,7 +26,7 @@
                 print("1.0.0")
             elif optlist[0][0] == "--cflags":
                 print(
-                    f"-I{fuchsia_dir}/src/graphics/lib/magma/include/magma_abi "
+                    f"-I{fuchsia_dir}/src/graphics/lib/magma/include/magma "
                 )
             elif optlist[0][0] == "--libs":
                 print(

media_driver/cmake/linux/media_compile_flags_linux.cmake

diff --git a/media_driver/cmake/linux/media_compile_flags_linux.cmake b/media_driver/cmake/linux/media_compile_flags_linux.cmake
index ae8481b..4224a9e 100755
--- a/media_driver/cmake/linux/media_compile_flags_linux.cmake
+++ b/media_driver/cmake/linux/media_compile_flags_linux.cmake
@@ -100,7 +100,7 @@
         -D_LIBCPP_ENABLE_THREAD_SAFETY_ANNOTATIONS=1
     )
     include_directories(
-        "$ENV{FUCHSIA_DIR}/src/graphics/lib/magma/include/magma_abi"
+        "$ENV{FUCHSIA_DIR}/src/graphics/lib/magma/include/magma"
         "$ENV{FUCHSIA_DIR}/src/graphics/drivers/msd-intel-gen/include"
     )
     link_libraries(