commit da8d3963775402b6372385e6229ba049f2b78c98
author Chase Latta <chaselatta@google.com> Fri Apr 29 03:45:24 2022 +0000
committer Commit Bot <commit-bot@chromium.org> Fri Apr 29 03:45:24 2022 +0000
tree d88e220babab4a2923afb45155c6d7709a422e74
parent 97def444024410a7cb46e3e8491f4320a3554a77

Start using fuchsia_driver_component

Change-Id: I3135f4c72dad27984787d4cde62ced477541ac43
Reviewed-on: https://fuchsia-review.googlesource.com/c/sdk-samples/drivers/+/674240
Reviewed-by: Suraj Malhotra <surajmalhotra@google.com>
Commit-Queue: Chase Latta <chaselatta@google.com>

WORKSPACE.bazel

diff --git a/WORKSPACE.bazel b/WORKSPACE.bazel
index 7a0c1f2..df1c27b 100644
--- a/WORKSPACE.bazel
+++ b/WORKSPACE.bazel
@@ -2,8 +2,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
-
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 http_archive(
        name = "bazel_skylib",

src/example_driver/BUILD.bazel

diff --git a/src/example_driver/BUILD.bazel b/src/example_driver/BUILD.bazel
index 4983263..8b33fae 100644
--- a/src/example_driver/BUILD.bazel
+++ b/src/example_driver/BUILD.bazel
@@ -1,7 +1,6 @@
 load(
     "@rules_fuchsia//fuchsia:defs.bzl",
-    "fuchsia_cc_binary",
-    "fuchsia_component",
+    "fuchsia_driver_component",
     "fuchsia_component_manifest",
     "fuchsia_driver_bytecode_bind_rules",
     "fuchsia_driver_header_bind_rules",
@@ -44,12 +43,10 @@
     src = "meta/example_driver.cml",
 )
 
-fuchsia_component(
+fuchsia_driver_component(
     name = "component",
-    content = {
-        ":example_driver": "lib/",
-        ":bind_bytecode": "meta/bind/",
-    },
+    driver_lib = ":example_driver",
+    bind_bytecode = ":bind_bytecode",
     manifest = ":manifest",
 )
 
@@ -62,28 +59,3 @@
     ],
 )
 
-#### TODO: create a macro that groups the driver parts above in a single rule:
-
-# fuchsia_driver_component(
-#     name = "example_driver",
-#     bind_rules = ":example_driver_bind",
-#     manifest = ":manifest",
-#     srcs = [
-#         "example_driver.cc",
-#         "example_driver.h",
-#         ],
-#     deps = [
-#         "@fuchsia_sdk//pkg/ddk",
-#         "@fuchsia_sdk//pkg/ddktl_experimental_driver_only",
-#         "@fuchsia_sdk//pkg/zx_experimental_driver_only",
-#         "@fuchsia_sdk//pkg/fidl_llcpp_experimental_driver_only",
-#         "@fuchsia_sdk//fidl/zx:zx_cc",
-#         ],
-#     )
-
-# fuchsia_package(
-#     name = "my_package",
-#     deps = [
-#         ":example_driver",
-#     ],
-# )

src/qemu_edu/BUILD.bazel

diff --git a/src/qemu_edu/BUILD.bazel b/src/qemu_edu/BUILD.bazel
index 30a4012..075698c 100644
--- a/src/qemu_edu/BUILD.bazel
+++ b/src/qemu_edu/BUILD.bazel
@@ -1,8 +1,9 @@
 load(
     "@rules_fuchsia//fuchsia:defs.bzl",
-    "fuchsia_cc_binary",
     "fuchsia_component",
     "fuchsia_component_manifest",
+    "fuchsia_cc_binary",
+    "fuchsia_driver_component",
     "fuchsia_driver_bytecode_bind_rules",
     "fuchsia_fidl_library",
     "fuchsia_fidl_llcpp_library",
@@ -59,12 +60,10 @@
     src = "meta/qemu_edu.cml",
 )
 
-fuchsia_component(
+fuchsia_driver_component(
     name = "component",
-    content = {
-        ":qemu_edu": "lib/",
-        ":bind_bytecode": "meta/bind/",
-    },
+    driver_lib = ":qemu_edu",
+    bind_bytecode = ":bind_bytecode",
     manifest = ":manifest",
 )
 

third_party/sdk-integration

diff --git a/third_party/sdk-integration b/third_party/sdk-integration
index 8f633bf..d6052d9 160000
--- a/third_party/sdk-integration
+++ b/third_party/sdk-integration
@@ -1 +1 @@
-Subproject commit 8f633bff7bbcaa11da4adc2d5672e31763bd4678
+Subproject commit d6052d933479b6746bef0d24afb2209f0f1b7a5e