[mdns] remove package_name parameter from package targets
This CL removes all the package_name parameters from package targets
relating to mdns. It also removes the superfluous package file
package/prod/mdns_util, which is leftover from renaming mdns_util to
mdns-util.
TEST: no behavior change, booted to ensure mdns still runs
Change-Id: I23193c62a007a0dc35d128f5b78afbe55f5d1b5e
diff --git a/bin/mdns/service/BUILD.gn b/bin/mdns/service/BUILD.gn
index 7248817..c26918f 100644
--- a/bin/mdns/service/BUILD.gn
+++ b/bin/mdns/service/BUILD.gn
@@ -100,7 +100,7 @@
]
}
-package("service") {
+package("mdns") {
deps = [
":bin",
]
@@ -111,8 +111,6 @@
},
]
- package_name = "mdns"
-
meta = [
{
path = rebase_path("meta/mdns.cmx")
@@ -121,9 +119,8 @@
]
}
-package("config") {
+package("mdns_config") {
deprecated_system_image = true
- package_name = "mdns_config"
resources = [
{
dest = "sysmgr/mdns.config"
diff --git a/bin/mdns/util/BUILD.gn b/bin/mdns/util/BUILD.gn
index b9d9b2b..70d6968 100644
--- a/bin/mdns/util/BUILD.gn
+++ b/bin/mdns/util/BUILD.gn
@@ -4,7 +4,7 @@
import("//build/package.gni")
-package("util") {
+package("mdns-util") {
deps = [
":bin",
]
@@ -16,8 +16,6 @@
},
]
- package_name = "mdns-util"
-
meta = [
{
path = rebase_path("meta/mdns-util.cmx")
diff --git a/packages/config/mdns b/packages/config/mdns
index 1b54a94..f00cf3c 100644
--- a/packages/config/mdns
+++ b/packages/config/mdns
@@ -3,6 +3,6 @@
"garnet/packages/config/network"
],
"packages": [
- "//garnet/bin/mdns/service:config"
+ "//garnet/bin/mdns/service:mdns_config"
]
}
diff --git a/packages/prod/all b/packages/prod/all
index 4cc153c..429b273 100644
--- a/packages/prod/all
+++ b/packages/prod/all
@@ -41,7 +41,6 @@
"garnet/packages/prod/magma_tools",
"garnet/packages/prod/mdns",
"garnet/packages/prod/mdns-util",
- "garnet/packages/prod/mdns_util",
"garnet/packages/prod/media",
"garnet/packages/prod/media_audio",
"garnet/packages/prod/media_codec",
diff --git a/packages/prod/mdns b/packages/prod/mdns
index a71f0d3..40e69c9 100644
--- a/packages/prod/mdns
+++ b/packages/prod/mdns
@@ -1,5 +1,5 @@
{
"packages": [
- "//garnet/bin/mdns/service"
+ "//garnet/bin/mdns/service:mdns"
]
}
diff --git a/packages/prod/mdns-util b/packages/prod/mdns-util
index a69c910..f6ac4a5 100644
--- a/packages/prod/mdns-util
+++ b/packages/prod/mdns-util
@@ -1,5 +1,5 @@
{
"packages": [
- "//garnet/bin/mdns/util"
+ "//garnet/bin/mdns/util:mdns-util"
]
}
diff --git a/packages/prod/mdns_util b/packages/prod/mdns_util
deleted file mode 100644
index a69c910..0000000
--- a/packages/prod/mdns_util
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "packages": [
- "//garnet/bin/mdns/util"
- ]
-}
