diff --git a/chromecast/BUILD.gn b/chromecast/BUILD.gn
index c7c67b9bf0f22..fe40aad8f163b 100644
--- a/chromecast/BUILD.gn
+++ b/chromecast/BUILD.gn
@@ -32,7 +32,7 @@ group("all") {
data_deps = []
deps = [ "//chromecast/build:archive" ]
if (is_android) {
- deps += [ ":cast_shell_apk" ]
+ deps += [ ":cast_browser_apk" ]
} else if (!is_fuchsia) {
data_deps += [
":cast_browser",
@@ -617,11 +617,11 @@ buildflag_header("chromecast_buildflags") {
}
if (is_android) {
- android_assets("cast_shell_apk_assets") {
+ android_assets("cast_browser_apk_assets") {
sources = [ "$root_out_dir/assets/cast_shell.pak" ]
deps = [
- ":cast_shell_apk_locale_assets",
+ ":cast_browser_apk_locale_assets",
":cast_shell_pak",
"//gin:v8_snapshot_assets",
"//third_party/icu:icu_assets",
@@ -629,7 +629,7 @@ if (is_android) {
disable_compression = true
}
- android_assets("cast_shell_apk_locale_assets") {
+ android_assets("cast_browser_apk_locale_assets") {
renaming_sources = []
renaming_destinations = []
@@ -644,7 +644,7 @@ if (is_android) {
disable_compression = true
}
- android_apk("cast_shell_apk") {
+ android_apk("cast_browser_apk") {
enable_lint = true
lint_baseline_file = "android/lint-baseline.xml"
lint_suppressions_file = "android/lint-suppressions.xml"
@@ -661,7 +661,7 @@ if (is_android) {
[ "//chromecast/android:libcast_shell_android__jni_registration" ]
deps = [
- ":cast_shell_apk_assets",
+ ":cast_browser_apk_assets",
"//base:base_java",
"//build/android:build_java",
"//chromecast/android:libcast_shell_android",
diff --git a/chromecast/android/BUILD.gn b/chromecast/android/BUILD.gn
index 0e76381168567..645b78ea80686 100644
--- a/chromecast/android/BUILD.gn
+++ b/chromecast/android/BUILD.gn
@@ -59,7 +59,7 @@ shared_library_with_jni("libcast_shell_android") {
":common_apk_deps",
"//chromecast/cast_core:core_runtime_lib_simple",
]
- java_targets = [ "//chromecast:cast_shell_apk" ]
+ java_targets = [ "//chromecast:cast_browser_apk" ]
}
shared_library_with_jni("libcast_browser_android") {
@@ -76,7 +76,7 @@ shared_library_with_jni("libcast_browser_android") {
"//chromecast/cast_core:core_runtime_lib_simple",
"//components/module_installer/android:native",
]
- java_targets = [ "//chromecast:cast_shell_apk" ]
+ java_targets = [ "//chromecast:cast_browser_apk" ]
}
group("native") {
diff --git a/chromecast/android/lint-baseline.xml b/chromecast/android/lint-baseline.xml
index cb95451f92700..1fb9f4ac83342 100644
--- a/chromecast/android/lint-baseline.xml
+++ b/chromecast/android/lint-baseline.xml
@@ -7,7 +7,7 @@
errorLine1=" <application android:name="org.chromium.chromecast.shell.CastApplication" android:icon="@drawable/ic_settings_cast">"
errorLine2=" ~~~~~~~~~~~">
<location
- file="gen/chromecast/cast_shell_apk__lint/AndroidManifest.xml"
+ file="gen/chromecast/cast_browser_apk__lint/AndroidManifest.xml"
line="37"
column="4"/>
</issue>
@@ -29,7 +29,7 @@
errorLine1=" <activity android:name="org.chromium.chromecast.shell.CastWebContentsActivity" android:theme="@style/CastShellTheme" android:exported="true" android:hardwareAccelerated="true" android:launchMode="singleInstance" android:screenOrientation="landscape" android:taskAffinity=".CastWebContentsActivity" android:supportsPictureInPicture="true" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|screenLayout|smallestScreenSize|uiMode" android:excludeFromRecents="false" android:noHistory="false" android:showWhenLocked="true">"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location
- file="gen/chromecast/cast_shell_apk__lint/AndroidManifest.xml"
+ file="gen/chromecast/cast_browser_apk__lint/AndroidManifest.xml"
line="71"
column="217"/>
</issue>
@@ -49,7 +49,7 @@
id="RtlEnabled"
message="The project references RTL attributes, but does not explicitly enable or disable RTL support with `android:supportsRtl` in the manifest">
<location
- file="gen/chromecast/cast_shell_apk__lint/AndroidManifest.xml"/>
+ file="gen/chromecast/cast_browser_apk__lint/AndroidManifest.xml"/>
</issue>
</issues>
diff --git a/chromecast/build/BUILD.gn b/chromecast/build/BUILD.gn
index dd7aa2765b31d..00d8b111253af 100644
--- a/chromecast/build/BUILD.gn
+++ b/chromecast/build/BUILD.gn
@@ -10,7 +10,7 @@ if (is_android) {
copy("archive_public_cast_apk") {
sources = [ "$root_out_dir/apks/CastShell.apk" ]
outputs = [ "$root_out_dir/archive/CastShell-$artifact_type_suffix.apk" ]
- deps = [ "//chromecast:cast_shell_apk" ]
+ deps = [ "//chromecast:cast_browser_apk" ]
}
}
diff --git a/docs/android_cast_build_instructions.md b/docs/android_cast_build_instructions.md
index 7305bf616e83e..a890d0083fc26 100644
--- a/docs/android_cast_build_instructions.md
+++ b/docs/android_cast_build_instructions.md
@@ -163,16 +163,16 @@ To use Reclient, follow the corresponding
## Build cast\_shell\_apk
-Build `cast_shell_apk` with Ninja using the command:
+Build `cast_browser_apk` with Ninja using the command:
```shell
-$ autoninja -C out/Default cast_shell_apk
+$ autoninja -C out/Default cast_browser_apk
```
(`autoninja` is a wrapper that automatically provides optimal values for the
arguments passed to `ninja`.)
-## Installing and Running `cast_shell_apk` on a device
+## Installing and Running `cast_browser_apk` on a device
### Plug in your Android device
@@ -201,15 +201,15 @@ unplugging and reattaching your device.
### Build the APK
```shell
-autoninja -C out/Release cast_shell_apk
+autoninja -C out/Release cast_browser_apk
```
And deploy it to your Android device:
```shell
-out/Default/bin/cast_shell_apk install
+out/Default/bin/cast_browser_apk install
# Or to install and run:
-out/Default/bin/cast_shell_apk run "http://google.com"
+out/Default/bin/cast_browser_apk run "http://google.com"
```
The app will appear on the device as "Chromium".
diff --git a/infra/config/generated/builders/ci/Cast Android (dbg)/targets/chromium.android.json b/infra/config/generated/builders/ci/Cast Android (dbg)/targets/chromium.android.json
index 4fc2ecb8a51af..206eefe1ac21b 100644
--- a/infra/config/generated/builders/ci/Cast Android (dbg)/targets/chromium.android.json
+++ b/infra/config/generated/builders/ci/Cast Android (dbg)/targets/chromium.android.json
@@ -1,8 +1,8 @@
{
"Cast Android (dbg)": {
"additional_compile_targets": [
- "cast_junit_test_lists",
- "cast_shell_apk"
+ "cast_browser_apk",
+ "cast_junit_test_lists"
],
"isolated_scripts": [
{
diff --git a/infra/config/generated/builders/ci/android-cast-arm-dbg/targets/chromium.android.json b/infra/config/generated/builders/ci/android-cast-arm-dbg/targets/chromium.android.json
index b2b00ffed00d4..7ba7a69a5a4b7 100644
--- a/infra/config/generated/builders/ci/android-cast-arm-dbg/targets/chromium.android.json
+++ b/infra/config/generated/builders/ci/android-cast-arm-dbg/targets/chromium.android.json
@@ -1,8 +1,8 @@
{
"android-cast-arm-dbg": {
"additional_compile_targets": [
+ "cast_browser_apk",
"cast_junit_test_lists",
- "cast_shell_apk",
"cast_test_lists"
],
"gtest_tests": [
diff --git a/infra/config/generated/builders/ci/android-cast-arm-rel/targets/chromium.android.json b/infra/config/generated/builders/ci/android-cast-arm-rel/targets/chromium.android.json
index a7ebf5b79da06..3643e1c58e042 100644
--- a/infra/config/generated/builders/ci/android-cast-arm-rel/targets/chromium.android.json
+++ b/infra/config/generated/builders/ci/android-cast-arm-rel/targets/chromium.android.json
@@ -1,8 +1,8 @@
{
"android-cast-arm-rel": {
"additional_compile_targets": [
+ "cast_browser_apk",
"cast_junit_test_lists",
- "cast_shell_apk",
"cast_test_lists"
],
"gtest_tests": [
diff --git a/infra/config/generated/builders/ci/android-cast-arm64-dbg/targets/chromium.android.json b/infra/config/generated/builders/ci/android-cast-arm64-dbg/targets/chromium.android.json
index 54bdc3ecab8d9..ab168a2d80119 100644
--- a/infra/config/generated/builders/ci/android-cast-arm64-dbg/targets/chromium.android.json
+++ b/infra/config/generated/builders/ci/android-cast-arm64-dbg/targets/chromium.android.json
@@ -1,8 +1,8 @@
{
"android-cast-arm64-dbg": {
"additional_compile_targets": [
+ "cast_browser_apk",
"cast_junit_test_lists",
- "cast_shell_apk",
"cast_test_lists"
],
"gtest_tests": [
diff --git a/infra/config/generated/builders/ci/android-cast-arm64-rel/targets/chromium.android.json b/infra/config/generated/builders/ci/android-cast-arm64-rel/targets/chromium.android.json
index 5e5567f61ac7e..a7ea6d6000dbf 100644
--- a/infra/config/generated/builders/ci/android-cast-arm64-rel/targets/chromium.android.json
+++ b/infra/config/generated/builders/ci/android-cast-arm64-rel/targets/chromium.android.json
@@ -1,8 +1,8 @@
{
"android-cast-arm64-rel": {
"additional_compile_targets": [
+ "cast_browser_apk",
"cast_junit_test_lists",
- "cast_shell_apk",
"cast_test_lists"
],
"gtest_tests": [
diff --git a/infra/config/generated/builders/try/android-cast-arm-dbg/targets/chromium.android.json b/infra/config/generated/builders/try/android-cast-arm-dbg/targets/chromium.android.json
index b2b00ffed00d4..7ba7a69a5a4b7 100644
--- a/infra/config/generated/builders/try/android-cast-arm-dbg/targets/chromium.android.json
+++ b/infra/config/generated/builders/try/android-cast-arm-dbg/targets/chromium.android.json
@@ -1,8 +1,8 @@
{
"android-cast-arm-dbg": {
"additional_compile_targets": [
+ "cast_browser_apk",
"cast_junit_test_lists",
- "cast_shell_apk",
"cast_test_lists"
],
"gtest_tests": [
diff --git a/infra/config/generated/builders/try/android-cast-arm-rel/targets/chromium.android.json b/infra/config/generated/builders/try/android-cast-arm-rel/targets/chromium.android.json
index a7ebf5b79da06..3643e1c58e042 100644
--- a/infra/config/generated/builders/try/android-cast-arm-rel/targets/chromium.android.json
+++ b/infra/config/generated/builders/try/android-cast-arm-rel/targets/chromium.android.json
@@ -1,8 +1,8 @@
{
"android-cast-arm-rel": {
"additional_compile_targets": [
+ "cast_browser_apk",
"cast_junit_test_lists",
- "cast_shell_apk",
"cast_test_lists"
],
"gtest_tests": [
diff --git a/infra/config/generated/builders/try/android-cast-arm64-dbg/targets/chromium.android.json b/infra/config/generated/builders/try/android-cast-arm64-dbg/targets/chromium.android.json
index 54bdc3ecab8d9..ab168a2d80119 100644
--- a/infra/config/generated/builders/try/android-cast-arm64-dbg/targets/chromium.android.json
+++ b/infra/config/generated/builders/try/android-cast-arm64-dbg/targets/chromium.android.json
@@ -1,8 +1,8 @@
{
"android-cast-arm64-dbg": {
"additional_compile_targets": [
+ "cast_browser_apk",
"cast_junit_test_lists",
- "cast_shell_apk",
"cast_test_lists"
],
"gtest_tests": [
diff --git a/infra/config/generated/builders/try/android-cast-arm64-rel/targets/chromium.android.json b/infra/config/generated/builders/try/android-cast-arm64-rel/targets/chromium.android.json
index 5e5567f61ac7e..a7ea6d6000dbf 100644
--- a/infra/config/generated/builders/try/android-cast-arm64-rel/targets/chromium.android.json
+++ b/infra/config/generated/builders/try/android-cast-arm64-rel/targets/chromium.android.json
@@ -1,8 +1,8 @@
{
"android-cast-arm64-rel": {
"additional_compile_targets": [
+ "cast_browser_apk",
"cast_junit_test_lists",
- "cast_shell_apk",
"cast_test_lists"
],
"gtest_tests": [
diff --git a/infra/config/generated/builders/try/android-x64-cast/targets/chromium.android.json b/infra/config/generated/builders/try/android-x64-cast/targets/chromium.android.json
index 4fc2ecb8a51af..206eefe1ac21b 100644
--- a/infra/config/generated/builders/try/android-x64-cast/targets/chromium.android.json
+++ b/infra/config/generated/builders/try/android-x64-cast/targets/chromium.android.json
@@ -1,8 +1,8 @@
{
"Cast Android (dbg)": {
"additional_compile_targets": [
- "cast_junit_test_lists",
- "cast_shell_apk"
+ "cast_browser_apk",
+ "cast_junit_test_lists"
],
"isolated_scripts": [
{
diff --git a/infra/config/generated/testing/gn_isolate_map.pyl b/infra/config/generated/testing/gn_isolate_map.pyl
index 67ec3d6af9db9..23a702a4af6e7 100644
--- a/infra/config/generated/testing/gn_isolate_map.pyl
+++ b/infra/config/generated/testing/gn_isolate_map.pyl
@@ -253,6 +253,10 @@
"label": "//chromecast/base:cast_base_unittests",
"type": "console_test_launcher",
},
+ "cast_browser_apk": {
+ "label": "//chromecast:cast_browser_apk",
+ "type": "additional_compile_target",
+ },
"cast_cast_core_unittests": {
"label": "//chromecast/cast_core:cast_cast_core_unittests",
"type": "console_test_launcher",
@@ -297,10 +301,6 @@
"label": "//chromecast:cast_shell",
"type": "additional_compile_target",
},
- "cast_shell_apk": {
- "label": "//chromecast:cast_shell_apk",
- "type": "additional_compile_target",
- },
"cast_shell_browsertests": {
"label": "//chromecast:cast_shell_browsertests",
"type": "console_test_launcher",
diff --git a/infra/config/subprojects/chromium/ci/chromium.android.star b/infra/config/subprojects/chromium/ci/chromium.android.star
index 70c0a2a6de1d7..66adc072fc47e 100644
--- a/infra/config/subprojects/chromium/ci/chromium.android.star
+++ b/infra/config/subprojects/chromium/ci/chromium.android.star
@@ -624,7 +624,7 @@ ci.builder(
],
additional_compile_targets = [
"cast_junit_test_lists",
- "cast_shell_apk",
+ "cast_browser_apk",
],
mixins = [
"has_native_resultdb_integration",
diff --git a/infra/config/targets/bundles.star b/infra/config/targets/bundles.star
index 5fbed72bdea51..54d062e2d2962 100644
--- a/infra/config/targets/bundles.star
+++ b/infra/config/targets/bundles.star
@@ -670,7 +670,7 @@ targets.bundle(
targets.bundle(
name = "chromium_android_cast_receiver",
additional_compile_targets = [
- "cast_shell_apk",
+ "cast_browser_apk",
],
)
diff --git a/infra/config/targets/compile_targets.star b/infra/config/targets/compile_targets.star
index 8bfe67c37cc5d..204e0dc8f85a2 100644
--- a/infra/config/targets/compile_targets.star
+++ b/infra/config/targets/compile_targets.star
@@ -54,8 +54,8 @@ targets.compile_target(
)
targets.compile_target(
- name = "cast_shell_apk",
- label = "//chromecast:cast_shell_apk",
+ name = "cast_browser_apk",
+ label = "//chromecast:cast_browser_apk",
)
targets.compile_target(
diff --git a/testing/buildbot/check.py b/testing/buildbot/check.py
index 4a2eb801c4b62..72a3c73c4f736 100755
--- a/testing/buildbot/check.py
+++ b/testing/buildbot/check.py
@@ -45,7 +45,7 @@ SKIP_GN_ISOLATE_MAP_TARGETS = {
'cast_junit_test_lists',
'cast_media_unittests',
'cast_shell',
- 'cast_shell_apk',
+ 'cast_browser_apk',
'cast_shell_browsertests',
'cast_shell_junit_tests',
'cast_shell_unittests',
diff --git a/third_party/pyjson5/src/benchmarks/chromium.linux.json b/third_party/pyjson5/src/benchmarks/chromium.linux.json
index 86d10eb95e77a..706af63850d5f 100644
--- a/third_party/pyjson5/src/benchmarks/chromium.linux.json
+++ b/third_party/pyjson5/src/benchmarks/chromium.linux.json
@@ -3130,7 +3130,7 @@
},
"Cast Android (dbg)": {
"additional_compile_targets": [
- "cast_shell_apk"
+ "cast_browser_apk"
]
},
"Cast Audio Linux": {
@@ -5195,4 +5195,4 @@
}
]
}
-}
+}
\ No newline at end of file