[tools] Rationalize configurations for bluetooth and scenic tools
This separates the bluetooth and scenic tools from their production
package configurations and updates the interactive configuration family
to incorporate only the production artifacts, not the tools. Most
product configurations will want to include the production artifacts in
'monolith' or 'preinstall' and the tools in 'available'.
Test: CQ
US-576 #comment
Change-Id: I0de314e9914c3f3b4a8a2c571e7ff1345f011c20
diff --git a/packages/prod/bluetooth b/packages/prod/bluetooth
index 9151c19..b51073a 100644
--- a/packages/prod/bluetooth
+++ b/packages/prod/bluetooth
@@ -2,8 +2,6 @@
"packages": [
"//garnet/bin/bluetooth/profiles/bt-a2dp-sink",
"//garnet/bin/bluetooth/bt-gap",
- "//garnet/bin/bluetooth/bt-mgr",
- "//garnet/bin/bluetooth/bt-snoop",
- "//garnet/bin/bluetooth/tools"
+ "//garnet/bin/bluetooth/bt-mgr"
]
}
diff --git a/packages/prod/scenic_tools b/packages/prod/scenic_tools
index 44dcf34..973e380 100644
--- a/packages/prod/scenic_tools
+++ b/packages/prod/scenic_tools
@@ -1,11 +1,5 @@
{
"imports": [
- "garnet/packages/prod/scenic"
- ],
- "packages": [
- "//garnet/bin/ui:scenic_tools",
- "//garnet/bin/ui:screencap",
- "//garnet/bin/ui:set_renderer_params",
- "//garnet/bin/ui:set_root_view"
+ "garnet/packages/tools/scenic"
]
}
diff --git a/packages/products/graphics-dev b/packages/products/graphics-dev
index f205ad3..c24f2b9 100644
--- a/packages/products/graphics-dev
+++ b/packages/products/graphics-dev
@@ -2,10 +2,10 @@
"imports": [
"garnet/packages/prod/pm",
"garnet/packages/prod/run",
- "garnet/packages/prod/scenic_tools",
"garnet/packages/prod/tracing",
"garnet/packages/prod/vboot_reference",
"garnet/packages/products/graphical",
+ "garnet/packages/tools/scenic",
"garnet/packages/tools/tiles"
]
}
diff --git a/packages/products/interactive b/packages/products/interactive
index c93ca41..fb5a2db 100644
--- a/packages/products/interactive
+++ b/packages/products/interactive
@@ -1,6 +1,6 @@
{
"imports": [
- "garnet/packages/products/interactive_base",
- "garnet/packages/prod/fonts"
+ "garnet/packages/prod/fonts",
+ "garnet/packages/products/interactive_base"
]
}
diff --git a/packages/products/interactive_base b/packages/products/interactive_base
index 8fb30a0..c55fcb0 100644
--- a/packages/products/interactive_base
+++ b/packages/products/interactive_base
@@ -1,12 +1,11 @@
{
"imports": [
- "garnet/packages/products/graphical",
"garnet/packages/prod/display_manager",
"garnet/packages/prod/fonts",
"garnet/packages/prod/media_audio",
"garnet/packages/prod/media_codec",
"garnet/packages/prod/mediaplayer",
- "garnet/packages/prod/scenic_tools",
- "garnet/packages/prod/vboot_reference"
+ "garnet/packages/prod/vboot_reference",
+ "garnet/packages/products/graphical"
]
}
diff --git a/packages/sdk/garnet b/packages/sdk/garnet
index b7bf7f8..f3050eb 100644
--- a/packages/sdk/garnet
+++ b/packages/sdk/garnet
@@ -31,6 +31,7 @@
"garnet/packages/prod/wlan",
"garnet/packages/products/devtools",
"garnet/packages/testing/run_test_component",
+ "garnet/packages/tools/bluetooth",
"garnet/packages/tools/tiles"
],
"labels": [
diff --git a/packages/tools/all b/packages/tools/all
index 1f01171..a2720d7 100644
--- a/packages/tools/all
+++ b/packages/tools/all
@@ -1,12 +1,14 @@
{
"imports": [
"garnet/packages/tools/audio",
+ "garnet/packages/tools/bluetooth",
"garnet/packages/tools/curl",
"garnet/packages/tools/fidlmerge",
"garnet/packages/tools/iperf",
"garnet/packages/tools/make-efi",
"garnet/packages/tools/make-fuchsia-vol",
"garnet/packages/tools/runmany",
+ "garnet/packages/tools/scenic",
"garnet/packages/tools/sl4f",
"garnet/packages/tools/tiles",
"garnet/packages/tools/zxdb"
diff --git a/packages/tools/bluetooth b/packages/tools/bluetooth
new file mode 100644
index 0000000..7e33e49
--- /dev/null
+++ b/packages/tools/bluetooth
@@ -0,0 +1,6 @@
+{
+ "packages": [
+ "//garnet/bin/bluetooth/bt-snoop",
+ "//garnet/bin/bluetooth/tools"
+ ]
+}
diff --git a/packages/tools/scenic b/packages/tools/scenic
new file mode 100644
index 0000000..7cc0e13
--- /dev/null
+++ b/packages/tools/scenic
@@ -0,0 +1,8 @@
+{
+ "packages": [
+ "//garnet/bin/ui:scenic_tools",
+ "//garnet/bin/ui:screencap",
+ "//garnet/bin/ui:set_renderer_params",
+ "//garnet/bin/ui:set_root_view"
+ ]
+}
diff --git a/products/base.gni b/products/base.gni
index ccba14d..edbb011 100644
--- a/products/base.gni
+++ b/products/base.gni
@@ -6,4 +6,7 @@
preinstall = []
-available = [ "garnet/packages/prod/vboot_reference" ]
+available = [
+ "garnet/packages/prod/vboot_reference",
+ "garnet/packages/tools/bluetooth",
+]
diff --git a/products/interactive.gni b/products/interactive.gni
index 079c600..0466777 100644
--- a/products/interactive.gni
+++ b/products/interactive.gni
@@ -6,4 +6,4 @@
preinstall = []
-available = []
+available = [ "garnet/packages/tools/scenic" ]
