[media] remove deprecated_bare_package_url from examples/media
This CL removes deprecated_bare_package_url annotations from the
BUILD.gn file in examples/media. It also fixes the binary names in
the examples' cmx files.
TEST: no behavior change, ran examples to test for regression
CF-435 #done
Change-Id: I2cab8826b2b74c6acd63e170ef821a2f0365f1dc
diff --git a/examples/media/BUILD.gn b/examples/media/BUILD.gn
index 9be4ff5..26a3a7d 100644
--- a/examples/media/BUILD.gn
+++ b/examples/media/BUILD.gn
@@ -9,8 +9,6 @@
# each example.
package("fx") {
- deprecated_bare_package_url = "//build"
-
deps = [
"fx",
]
@@ -31,8 +29,6 @@
}
package("simple_sine") {
- deprecated_bare_package_url = "//build"
-
deps = [
"simple_sine",
]
@@ -53,8 +49,6 @@
}
package("simple_sine_sync") {
- deprecated_bare_package_url = "//build"
-
deps = [
"simple_sine_sync",
]
@@ -75,8 +69,6 @@
}
package("tones") {
- deprecated_bare_package_url = "//build"
-
deps = [
"tones",
]
@@ -97,8 +89,6 @@
}
package("tts") {
- deprecated_bare_package_url = "//build"
-
deps = [
"tts",
]
@@ -120,7 +110,6 @@
package("use_media_decoder") {
testonly = true
- deprecated_bare_package_url = "//build"
deps = [
"use_media_decoder",
@@ -146,8 +135,6 @@
#
package("use_aac_decoder_test") {
- deprecated_bare_package_url = "//build"
-
testonly = true
deps = [
diff --git a/examples/media/fx/meta/fx.cmx b/examples/media/fx/meta/fx.cmx
index b0ca623..f9632e8 100644
--- a/examples/media/fx/meta/fx.cmx
+++ b/examples/media/fx/meta/fx.cmx
@@ -1,6 +1,6 @@
{
"program": {
- "binary": "bin/app"
+ "binary": "bin/fx"
},
"sandbox": {
"dev": [
diff --git a/examples/media/simple_sine/meta/simple_sine.cmx b/examples/media/simple_sine/meta/simple_sine.cmx
index c7cbbee..cbead74 100644
--- a/examples/media/simple_sine/meta/simple_sine.cmx
+++ b/examples/media/simple_sine/meta/simple_sine.cmx
@@ -1,6 +1,6 @@
{
"program": {
- "binary": "bin/app"
+ "binary": "bin/simple_sine"
},
"sandbox": {
"services": [
diff --git a/examples/media/simple_sine_sync/meta/simple_sine_sync.cmx b/examples/media/simple_sine_sync/meta/simple_sine_sync.cmx
index c7cbbee..9ca9f92 100644
--- a/examples/media/simple_sine_sync/meta/simple_sine_sync.cmx
+++ b/examples/media/simple_sine_sync/meta/simple_sine_sync.cmx
@@ -1,6 +1,6 @@
{
"program": {
- "binary": "bin/app"
+ "binary": "bin/simple_sine_sync"
},
"sandbox": {
"services": [
diff --git a/examples/media/tones/meta/tones.cmx b/examples/media/tones/meta/tones.cmx
index c7cbbee..05b4fab 100644
--- a/examples/media/tones/meta/tones.cmx
+++ b/examples/media/tones/meta/tones.cmx
@@ -1,6 +1,6 @@
{
"program": {
- "binary": "bin/app"
+ "binary": "bin/tones"
},
"sandbox": {
"services": [
diff --git a/examples/media/tts/meta/tts.cmx b/examples/media/tts/meta/tts.cmx
index 9e6d2b1..b254ee8 100644
--- a/examples/media/tts/meta/tts.cmx
+++ b/examples/media/tts/meta/tts.cmx
@@ -1,6 +1,6 @@
{
"program": {
- "binary": "bin/app"
+ "binary": "bin/tts"
},
"sandbox": {
"services": [
diff --git a/examples/media/use_media_decoder/meta/use_media_decoder.cmx b/examples/media/use_media_decoder/meta/use_media_decoder.cmx
index f340e60..ce30a72 100644
--- a/examples/media/use_media_decoder/meta/use_media_decoder.cmx
+++ b/examples/media/use_media_decoder/meta/use_media_decoder.cmx
@@ -1,6 +1,6 @@
{
"program": {
- "binary": "bin/app"
+ "binary": "bin/use_media_decoder"
},
"sandbox": {
"features": [