commit ae8aa1c4e396b2d9d27a141c5abfc9afb21d7386
author John Bauman <jbauman@google.com> Fri May 04 14:45:32 2018 -0700
committer John Bauman <jbauman@google.com> Fri May 04 15:11:20 2018 -0700
tree 3c5789455e16113fc1a35dd3d3a781f688636344
parent da170885065385cda807d7782a356ff7f5c6f839

Move validation layers to separate package

This package can be included when debugging vulkan, but is not necessary
by default for production builds.

MA-453

Change-Id: I16e9a3283faf4ee2daf34f2ec0732c97058452da

layers/BUILD.gn

diff --git a/layers/BUILD.gn b/layers/BUILD.gn
index 8abe8b3..3737eb6 100644
--- a/layers/BUILD.gn
+++ b/layers/BUILD.gn
@@ -22,19 +22,15 @@
 import("//garnet/lib/magma/gnbuild/magma.gni")
 import("//build/package.gni")
 
-package("vulkan_loader_and_layers") {
+package("vulkan_validation_layers") {
   deprecated_system_image = true
 
   deps = [
     ":layers",
-    "//third_party/vulkan_loader_and_validation_layers/loader",
   ]
 
   libraries = [
     {
-      name = "libvulkan.so"
-    },
-    {
       name = "libVkLayer_core_validation.so"
     },
     {
@@ -75,7 +71,7 @@
     {
       path = rebase_path("fuchsia/VkLayer_standard_validation.json")
       dest = "vulkan/explicit_layer.d/VkLayer_standard_validation.json"
-    }
+    },
   ]
 }
 
@@ -102,10 +98,10 @@
 group("layers") {
   public_deps = [
     ":VkLayer_core_validation",
+    ":VkLayer_object_tracker",
     ":VkLayer_parameter_validation",
     ":VkLayer_threading",
     ":VkLayer_unique_objects",
-    ":VkLayer_object_tracker",
   ]
 }
 
@@ -195,4 +191,4 @@
   deps = [
     ":layer_common",
   ]
-}
\ No newline at end of file
+}

loader/BUILD.gn

diff --git a/loader/BUILD.gn b/loader/BUILD.gn
index 1be06fc..bac2977 100644
--- a/loader/BUILD.gn
+++ b/loader/BUILD.gn
@@ -19,10 +19,26 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
 
+import("//build/package.gni")
+
 declare_args() {
   vk_loader_debug = "warn,error"
 }
 
+package("vulkan_loader") {
+  deprecated_system_image = true
+
+  deps = [
+    ":loader",
+  ]
+
+  libraries = [
+    {
+      name = "libvulkan.so"
+    },
+  ]
+}
+
 shared_library("loader") {
   # The Vulkan loader is named libvulkan
   output_name = "vulkan"