[Fuchsia] Fix libmagma dependency
It should only be used on executable targets,
because we want to be able to choose between different
implementations.
Change-Id: I832f97c37e2acbe2e50ff70cc78fcd0e90721ad0
Reviewed-on: https://fuchsia-review.googlesource.com/c/third_party/mesa/+/375393
Reviewed-by: John Bauman <jbauman@google.com>
diff --git a/src/intel/common/BUILD.gn b/src/intel/common/BUILD.gn
index fa496ce..98770cc 100644
--- a/src/intel/common/BUILD.gn
+++ b/src/intel/common/BUILD.gn
@@ -1,23 +1,23 @@
-# Copyright 2017 Google, LLC
+#Copyright 2017 Google, LLC
#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
+#Permission is hereby granted, free of charge, to any person obtaining a
+#copy of this software and associated documentation files(the "Software"),
+#to deal in the Software without restriction, including without limitation
+#the rights to use, copy, modify, merge, publish, distribute, sublicense,
+#and / or sell copies of the Software, and to permit persons to whom the
+#Software is furnished to do so, subject to the following conditions:
#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
+#The above copyright notice and this permission notice(including the next
+#paragraph) shall be included in all copies or substantial portions of the
+#Software.
#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-# IN THE SOFTWARE.
+#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+#FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL
+#THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+#LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+#FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+#IN THE SOFTWARE.
import("../../../mesa.gni")
@@ -37,9 +37,9 @@
"gen_decoder.h",
"gen_disasm.c",
"gen_gem.h",
- "gen_magma.c",
"gen_l3_config.c",
"gen_l3_config.h",
+ "gen_magma.c",
"gen_sample_positions.h",
"gen_urb_config.c",
"intel_log.c",
@@ -51,20 +51,14 @@
include_dirs = [ "$mesa_build_root/src/mesa" ]
deps = [
+ # Don't depend on libmagma here, do that on executable targets only
+ "$magma_build_root/include:magma_abi",
"$mesa_build_root/src/util",
+ "$msd_intel_gen_build_root/include",
]
- defines = ["ANV_MAGMA=1"]
+ defines = [ "ANV_MAGMA=1" ]
if (is_fuchsia) {
- deps += [
- "$msd_intel_gen_build_root/include",
- "$magma_build_root/src/libmagma",
- "//zircon/public/lib/syslog-static",
- ]
- } else if (is_linux) {
- deps += [
- "$msd_intel_gen_build_root/include",
- "$magma_build_root/src/libmagma_linux",
- ]
+ deps += [ "//zircon/public/lib/syslog-static" ]
}
}
diff --git a/src/os/BUILD.gn b/src/os/BUILD.gn
index 736fc00..872d374 100644
--- a/src/os/BUILD.gn
+++ b/src/os/BUILD.gn
@@ -1,23 +1,23 @@
-# Copyright 2019 Google, LLC
+#Copyright 2019 Google, LLC
#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
+#Permission is hereby granted, free of charge, to any person obtaining a
+#copy of this software and associated documentation files(the "Software"),
+#to deal in the Software without restriction, including without limitation
+#the rights to use, copy, modify, merge, publish, distribute, sublicense,
+#and / or sell copies of the Software, and to permit persons to whom the
+#Software is furnished to do so, subject to the following conditions:
#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
+#The above copyright notice and this permission notice(including the next
+#paragraph) shall be included in all copies or substantial portions of the
+#Software.
#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-# IN THE SOFTWARE.
+#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+#FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL
+#THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+#LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+#FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+#IN THE SOFTWARE.
import("../../mesa.gni")
@@ -27,10 +27,9 @@
"fuchsia.cpp",
"fuchsia.h",
]
- deps = [
- "$magma_build_root/include:magma_abi",
- "$magma_build_root/src/libmagma",
- ]
+
+ # Don't depend on libmagma here, do that on executable targets only
+ deps = [ "$magma_build_root/include:magma_abi" ]
}
}
diff --git a/tests/BUILD.gn b/tests/BUILD.gn
index 7f08c22..afc8ebf 100644
--- a/tests/BUILD.gn
+++ b/tests/BUILD.gn
@@ -1,45 +1,43 @@
-# Copyright 2016 Google, LLC
+#Copyright 2016 Google, LLC
#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
+#Permission is hereby granted, free of charge, to any person obtaining a
+#copy of this software and associated documentation files(the "Software"),
+#to deal in the Software without restriction, including without limitation
+#the rights to use, copy, modify, merge, publish, distribute, sublicense,
+#and / or sell copies of the Software, and to permit persons to whom the
+#Software is furnished to do so, subject to the following conditions:
#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
+#The above copyright notice and this permission notice(including the next
+#paragraph) shall be included in all copies or substantial portions of the
+#Software.
#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-# IN THE SOFTWARE.
+#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+#FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL
+#THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+#LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+#FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+#IN THE SOFTWARE.
import("../mesa.gni")
group("tests") {
testonly = true
- public_deps = [
- ":mesa_unit_tests",
- ]
+ public_deps = [ ":mesa_unit_tests" ]
}
executable("mesa_unit_tests") {
testonly = true
+ assert(is_fuchsia)
- sources = [
- "main.cc",
- ]
+ sources = [ "main.cc" ]
deps = [
- "$mesa_build_root/src/util/tests/os_dirent",
- "$mesa_build_root/src/util/tests/inflight_list",
+ "$magma_build_root/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",
"$mesa_build_root/src/util/tests/vector",
"//third_party/googletest:gtest",
]
