[appmgr] Migrate uses of 'shell' to 'deprecated-shell' in topaz.
Added an allowlist for topaz as well.
SEC-305
Change-Id: I18a65f67cf9c9796988fc3e8712fbeb581b517ce
diff --git a/BUILD.gn b/BUILD.gn
index 9e26875..b551ba9 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -11,3 +11,28 @@
"shell:tests",
]
}
+
+group("deprecated_shell_allowlist") {
+ # ________ _________ ________ ________
+ # |\ ____\|\___ ___\\ __ \|\ __ \
+ # \ \ \___|\|___ \ \_\ \ \|\ \ \ \|\ \
+ # \ \_____ \ \ \ \ \ \ \\\ \ \ ____\
+ # \|____|\ \ \ \ \ \ \ \\\ \ \ \___|
+ # ____\_\ \ \ \__\ \ \_______\ \__\
+ # |\_________\ \|__| \|_______|\|__|
+ # \|_________|
+ # This is an allowlist of packages that have components manifests that include
+ # the "deprecated-shell" feature. Do not add to this list. If the manifest
+ # does not otherwise include the feature you need, please file a feature
+ # request for that fine-grained feature to help us support least-privileged
+ # components.
+ visibility = [
+ "//topaz/app/term:term",
+ "//topaz/bin/flutter_screencap_test:flutter_screencap_test_pkg",
+ "//topaz/examples/test/driver_example_mod:driver_example_mod_tests_pkg",
+ "//topaz/public/dart/fuchsia_inspect/examples/inspect_mod:inspect_mod_test_pkg",
+ "//topaz/public/dart/fuchsia_inspect/test/integration:dart_inspect_vmo_test",
+ "//topaz/public/dart/fuchsia_modular/examples/slider_mod:slider_mod_tests_pkg",
+ "//topaz/tests/benchmarks/input_latency:topaz_input_latency_benchmarks",
+ ]
+}
diff --git a/app/term/BUILD.gn b/app/term/BUILD.gn
index 66cffa3..bc95476 100644
--- a/app/term/BUILD.gn
+++ b/app/term/BUILD.gn
@@ -62,6 +62,8 @@
}
package("term") {
+ deprecated_shell = "//topaz"
+
deps = [
":bin",
]
diff --git a/app/term/meta/term.cmx b/app/term/meta/term.cmx
index 3c96639..b0988ec 100644
--- a/app/term/meta/term.cmx
+++ b/app/term/meta/term.cmx
@@ -6,7 +6,7 @@
"dev": [
"misc/ptmx"
],
- "features": [ "shell" ],
+ "features": [ "deprecated-shell" ],
"services": [
"fuchsia.fonts.Provider",
"fuchsia.process.Launcher",
diff --git a/bin/flutter_screencap_test/BUILD.gn b/bin/flutter_screencap_test/BUILD.gn
index 79f29c4..1f94517 100644
--- a/bin/flutter_screencap_test/BUILD.gn
+++ b/bin/flutter_screencap_test/BUILD.gn
@@ -24,6 +24,8 @@
}
dart_fuchsia_test("flutter_screencap_test") {
+ deprecated_shell = "//topaz"
+
meta = [
{
path = rebase_path("meta/flutter_screencap_test.cmx")
diff --git a/bin/flutter_screencap_test/meta/flutter_screencap_test.cmx b/bin/flutter_screencap_test/meta/flutter_screencap_test.cmx
index 922341b..2249a50 100644
--- a/bin/flutter_screencap_test/meta/flutter_screencap_test.cmx
+++ b/bin/flutter_screencap_test/meta/flutter_screencap_test.cmx
@@ -18,7 +18,7 @@
},
"sandbox": {
"features": [
- "shell"
+ "deprecated-shell"
],
"services": [
"fuchsia.auth.account.AccountManager",
diff --git a/examples/test/driver_example_mod/BUILD.gn b/examples/test/driver_example_mod/BUILD.gn
index c850a0d..ff937a4 100644
--- a/examples/test/driver_example_mod/BUILD.gn
+++ b/examples/test/driver_example_mod/BUILD.gn
@@ -40,6 +40,8 @@
# device using fx run-test. The target application must be available on the
# machine.
dart_fuchsia_test("driver_example_mod_tests") {
+ deprecated_shell = "//topaz"
+
deps = [
"//sdk/fidl/fuchsia.sys",
"//third_party/dart-pkg/git/flutter/packages/flutter_driver",
diff --git a/examples/test/driver_example_mod/meta/driver_example_mod_tests.cmx b/examples/test/driver_example_mod/meta/driver_example_mod_tests.cmx
index f39257f..87d1ef7 100644
--- a/examples/test/driver_example_mod/meta/driver_example_mod_tests.cmx
+++ b/examples/test/driver_example_mod/meta/driver_example_mod_tests.cmx
@@ -22,7 +22,7 @@
},
"sandbox": {
"features": [
- "shell"
+ "deprecated-shell"
],
"services": [
"fuchsia.net.SocketProvider",
diff --git a/public/dart/fuchsia_inspect/examples/inspect_mod/BUILD.gn b/public/dart/fuchsia_inspect/examples/inspect_mod/BUILD.gn
index 46ecfc0..d65ad7f 100644
--- a/public/dart/fuchsia_inspect/examples/inspect_mod/BUILD.gn
+++ b/public/dart/fuchsia_inspect/examples/inspect_mod/BUILD.gn
@@ -30,6 +30,8 @@
}
dart_fuchsia_test("inspect_mod_test") {
+ deprecated_shell = "//topaz"
+
sources = [
"inspect_mod_test.dart",
"util.dart",
diff --git a/public/dart/fuchsia_inspect/examples/inspect_mod/meta/inspect_mod_test.cmx b/public/dart/fuchsia_inspect/examples/inspect_mod/meta/inspect_mod_test.cmx
index 86c6195..3a739a4 100644
--- a/public/dart/fuchsia_inspect/examples/inspect_mod/meta/inspect_mod_test.cmx
+++ b/public/dart/fuchsia_inspect/examples/inspect_mod/meta/inspect_mod_test.cmx
@@ -22,7 +22,7 @@
},
"sandbox": {
"features": [
- "shell"
+ "deprecated-shell"
],
"services": [
"fuchsia.net.SocketProvider",
diff --git a/public/dart/fuchsia_inspect/test/integration/BUILD.gn b/public/dart/fuchsia_inspect/test/integration/BUILD.gn
index eda71a2..1104fc8 100644
--- a/public/dart/fuchsia_inspect/test/integration/BUILD.gn
+++ b/public/dart/fuchsia_inspect/test/integration/BUILD.gn
@@ -26,6 +26,8 @@
}
test_package("dart_inspect_vmo_test") {
+ deprecated_shell = "//topaz"
+
deps = [
":test",
]
diff --git a/public/dart/fuchsia_inspect/test/integration/meta/dart_inspect_vmo_test.cmx b/public/dart/fuchsia_inspect/test/integration/meta/dart_inspect_vmo_test.cmx
index f4567b7..b70ae28 100644
--- a/public/dart/fuchsia_inspect/test/integration/meta/dart_inspect_vmo_test.cmx
+++ b/public/dart/fuchsia_inspect/test/integration/meta/dart_inspect_vmo_test.cmx
@@ -4,7 +4,7 @@
},
"sandbox": {
"features": [
- "shell"
+ "deprecated-shell"
],
"services": [
"fuchsia.sys.Environment",
diff --git a/public/dart/fuchsia_modular/examples/slider_mod/BUILD.gn b/public/dart/fuchsia_modular/examples/slider_mod/BUILD.gn
index df329d4..b08312f 100644
--- a/public/dart/fuchsia_modular/examples/slider_mod/BUILD.gn
+++ b/public/dart/fuchsia_modular/examples/slider_mod/BUILD.gn
@@ -48,6 +48,8 @@
# This can be run on the Fuchsia device using fx run-test. The slider mod must
# be available on the machine.
dart_fuchsia_test("slider_mod_tests") {
+ deprecated_shell = "//topaz"
+
sources = [
"slider_mod_widget_test.dart",
]
diff --git a/public/dart/fuchsia_modular/examples/slider_mod/meta/slider_mod_tests.cmx b/public/dart/fuchsia_modular/examples/slider_mod/meta/slider_mod_tests.cmx
index 1ed38e5..53e97bc 100644
--- a/public/dart/fuchsia_modular/examples/slider_mod/meta/slider_mod_tests.cmx
+++ b/public/dart/fuchsia_modular/examples/slider_mod/meta/slider_mod_tests.cmx
@@ -11,7 +11,7 @@
},
"sandbox": {
"features": [
- "shell"
+ "deprecated-shell"
],
"services": [
"fuchsia.net.SocketProvider",
diff --git a/runtime/dart/dart_component.gni b/runtime/dart/dart_component.gni
index 2f58fba..b764dc5 100644
--- a/runtime/dart/dart_component.gni
+++ b/runtime/dart/dart_component.gni
@@ -110,6 +110,7 @@
forward_variables_from(invoker,
[
"deprecated_global_persistent_storage",
+ "deprecated_shell",
"testonly",
"tests",
])
diff --git a/runtime/dart/dart_fuchsia_test.gni b/runtime/dart/dart_fuchsia_test.gni
index df6bbec..48dd739 100644
--- a/runtime/dart/dart_fuchsia_test.gni
+++ b/runtime/dart/dart_fuchsia_test.gni
@@ -105,6 +105,7 @@
dart_jit_app(target_name) {
forward_variables_from(invoker,
[
+ "deprecated_shell",
"disable_analysis",
"sandbox",
"meta",
diff --git a/tests/benchmarks/input_latency/BUILD.gn b/tests/benchmarks/input_latency/BUILD.gn
index 7649e1d..857be11 100644
--- a/tests/benchmarks/input_latency/BUILD.gn
+++ b/tests/benchmarks/input_latency/BUILD.gn
@@ -5,6 +5,8 @@
import("//build/package.gni")
package("topaz_input_latency_benchmarks") {
+ deprecated_shell = "//topaz"
+
testonly = true
deps = [
diff --git a/tests/benchmarks/input_latency/run_button_flutter_benchmark.cmx b/tests/benchmarks/input_latency/run_button_flutter_benchmark.cmx
index 4df1d49..e496b5f 100644
--- a/tests/benchmarks/input_latency/run_button_flutter_benchmark.cmx
+++ b/tests/benchmarks/input_latency/run_button_flutter_benchmark.cmx
@@ -4,7 +4,7 @@
},
"sandbox": {
"features": [
- "shell"
+ "deprecated-shell"
],
"services": [
"fuchsia.process.Launcher",
