0

[chromecast] rename cast_shell_apk to cast_browser_apk.

"cast_shell" is a vestigial name that misrepresents this
target's current role. Its purpose now is to serve as a
standalone browser that can be controlled through the IPC
from Cast code hosted in a separate module.

The team has been referring to this target as the
"cast_browser" colloquially for some time; this change simply
aligns the build target name with the established nomenclature.

Bug: b/323985314
Test: build cast_browser_apk
Change-Id: I9c5ab77351214d966f1e28bf5ce3319c0498ee74
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5892426
Auto-Submit: Simeon Anfinrud <sanfin@chromium.org>
Reviewed-by: Vigen Issahhanjan <vigeni@google.com>
Reviewed-by: Ben Pastene <bpastene@chromium.org>
Reviewed-by: Nico Weber <thakis@chromium.org>
Commit-Queue: Simeon Anfinrud <sanfin@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1360828}
This commit is contained in:
Simeon Anfinrud
2024-09-26 22:57:56 +00:00
committed by Chromium LUCI CQ
parent 2e650f7912
commit 43f47b7de7
21 changed files with 41 additions and 41 deletions
chromecast
docs
infra/config
generated
builders
ci
Cast Android (dbg)
android-cast-arm-dbg
android-cast-arm-rel
android-cast-arm64-dbg
android-cast-arm64-rel
try
android-cast-arm-dbg
android-cast-arm-rel
android-cast-arm64-dbg
android-cast-arm64-rel
android-x64-cast
testing
subprojects
targets
testing/buildbot
third_party/pyjson5/src/benchmarks

@ -32,7 +32,7 @@ group("all") {
data_deps = [] data_deps = []
deps = [ "//chromecast/build:archive" ] deps = [ "//chromecast/build:archive" ]
if (is_android) { if (is_android) {
deps += [ ":cast_shell_apk" ] deps += [ ":cast_browser_apk" ]
} else if (!is_fuchsia) { } else if (!is_fuchsia) {
data_deps += [ data_deps += [
":cast_browser", ":cast_browser",
@ -617,11 +617,11 @@ buildflag_header("chromecast_buildflags") {
} }
if (is_android) { if (is_android) {
android_assets("cast_shell_apk_assets") { android_assets("cast_browser_apk_assets") {
sources = [ "$root_out_dir/assets/cast_shell.pak" ] sources = [ "$root_out_dir/assets/cast_shell.pak" ]
deps = [ deps = [
":cast_shell_apk_locale_assets", ":cast_browser_apk_locale_assets",
":cast_shell_pak", ":cast_shell_pak",
"//gin:v8_snapshot_assets", "//gin:v8_snapshot_assets",
"//third_party/icu:icu_assets", "//third_party/icu:icu_assets",
@ -629,7 +629,7 @@ if (is_android) {
disable_compression = true disable_compression = true
} }
android_assets("cast_shell_apk_locale_assets") { android_assets("cast_browser_apk_locale_assets") {
renaming_sources = [] renaming_sources = []
renaming_destinations = [] renaming_destinations = []
@ -644,7 +644,7 @@ if (is_android) {
disable_compression = true disable_compression = true
} }
android_apk("cast_shell_apk") { android_apk("cast_browser_apk") {
enable_lint = true enable_lint = true
lint_baseline_file = "android/lint-baseline.xml" lint_baseline_file = "android/lint-baseline.xml"
lint_suppressions_file = "android/lint-suppressions.xml" lint_suppressions_file = "android/lint-suppressions.xml"
@ -661,7 +661,7 @@ if (is_android) {
[ "//chromecast/android:libcast_shell_android__jni_registration" ] [ "//chromecast/android:libcast_shell_android__jni_registration" ]
deps = [ deps = [
":cast_shell_apk_assets", ":cast_browser_apk_assets",
"//base:base_java", "//base:base_java",
"//build/android:build_java", "//build/android:build_java",
"//chromecast/android:libcast_shell_android", "//chromecast/android:libcast_shell_android",

@ -59,7 +59,7 @@ shared_library_with_jni("libcast_shell_android") {
":common_apk_deps", ":common_apk_deps",
"//chromecast/cast_core:core_runtime_lib_simple", "//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") { 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", "//chromecast/cast_core:core_runtime_lib_simple",
"//components/module_installer/android:native", "//components/module_installer/android:native",
] ]
java_targets = [ "//chromecast:cast_shell_apk" ] java_targets = [ "//chromecast:cast_browser_apk" ]
} }
group("native") { group("native") {

@ -7,7 +7,7 @@
errorLine1=" &lt;application android:name=&quot;org.chromium.chromecast.shell.CastApplication&quot; android:icon=&quot;@drawable/ic_settings_cast&quot;>" errorLine1=" &lt;application android:name=&quot;org.chromium.chromecast.shell.CastApplication&quot; android:icon=&quot;@drawable/ic_settings_cast&quot;>"
errorLine2=" ~~~~~~~~~~~"> errorLine2=" ~~~~~~~~~~~">
<location <location
file="gen/chromecast/cast_shell_apk__lint/AndroidManifest.xml" file="gen/chromecast/cast_browser_apk__lint/AndroidManifest.xml"
line="37" line="37"
column="4"/> column="4"/>
</issue> </issue>
@ -29,7 +29,7 @@
errorLine1=" &lt;activity android:name=&quot;org.chromium.chromecast.shell.CastWebContentsActivity&quot; android:theme=&quot;@style/CastShellTheme&quot; android:exported=&quot;true&quot; android:hardwareAccelerated=&quot;true&quot; android:launchMode=&quot;singleInstance&quot; android:screenOrientation=&quot;landscape&quot; android:taskAffinity=&quot;.CastWebContentsActivity&quot; android:supportsPictureInPicture=&quot;true&quot; android:configChanges=&quot;orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|screenLayout|smallestScreenSize|uiMode&quot; android:excludeFromRecents=&quot;false&quot; android:noHistory=&quot;false&quot; android:showWhenLocked=&quot;true&quot;>" errorLine1=" &lt;activity android:name=&quot;org.chromium.chromecast.shell.CastWebContentsActivity&quot; android:theme=&quot;@style/CastShellTheme&quot; android:exported=&quot;true&quot; android:hardwareAccelerated=&quot;true&quot; android:launchMode=&quot;singleInstance&quot; android:screenOrientation=&quot;landscape&quot; android:taskAffinity=&quot;.CastWebContentsActivity&quot; android:supportsPictureInPicture=&quot;true&quot; android:configChanges=&quot;orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|screenLayout|smallestScreenSize|uiMode&quot; android:excludeFromRecents=&quot;false&quot; android:noHistory=&quot;false&quot; android:showWhenLocked=&quot;true&quot;>"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
<location <location
file="gen/chromecast/cast_shell_apk__lint/AndroidManifest.xml" file="gen/chromecast/cast_browser_apk__lint/AndroidManifest.xml"
line="71" line="71"
column="217"/> column="217"/>
</issue> </issue>
@ -49,7 +49,7 @@
id="RtlEnabled" id="RtlEnabled"
message="The project references RTL attributes, but does not explicitly enable or disable RTL support with `android:supportsRtl` in the manifest"> message="The project references RTL attributes, but does not explicitly enable or disable RTL support with `android:supportsRtl` in the manifest">
<location <location
file="gen/chromecast/cast_shell_apk__lint/AndroidManifest.xml"/> file="gen/chromecast/cast_browser_apk__lint/AndroidManifest.xml"/>
</issue> </issue>
</issues> </issues>

@ -10,7 +10,7 @@ if (is_android) {
copy("archive_public_cast_apk") { copy("archive_public_cast_apk") {
sources = [ "$root_out_dir/apks/CastShell.apk" ] sources = [ "$root_out_dir/apks/CastShell.apk" ]
outputs = [ "$root_out_dir/archive/CastShell-$artifact_type_suffix.apk" ] outputs = [ "$root_out_dir/archive/CastShell-$artifact_type_suffix.apk" ]
deps = [ "//chromecast:cast_shell_apk" ] deps = [ "//chromecast:cast_browser_apk" ]
} }
} }

@ -163,16 +163,16 @@ To use Reclient, follow the corresponding
## Build cast\_shell\_apk ## Build cast\_shell\_apk
Build `cast_shell_apk` with Ninja using the command: Build `cast_browser_apk` with Ninja using the command:
```shell ```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 (`autoninja` is a wrapper that automatically provides optimal values for the
arguments passed to `ninja`.) 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 ### Plug in your Android device
@ -201,15 +201,15 @@ unplugging and reattaching your device.
### Build the APK ### Build the APK
```shell ```shell
autoninja -C out/Release cast_shell_apk autoninja -C out/Release cast_browser_apk
``` ```
And deploy it to your Android device: And deploy it to your Android device:
```shell ```shell
out/Default/bin/cast_shell_apk install out/Default/bin/cast_browser_apk install
# Or to install and run: # 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". The app will appear on the device as "Chromium".

@ -1,8 +1,8 @@
{ {
"Cast Android (dbg)": { "Cast Android (dbg)": {
"additional_compile_targets": [ "additional_compile_targets": [
"cast_junit_test_lists", "cast_browser_apk",
"cast_shell_apk" "cast_junit_test_lists"
], ],
"isolated_scripts": [ "isolated_scripts": [
{ {

@ -1,8 +1,8 @@
{ {
"android-cast-arm-dbg": { "android-cast-arm-dbg": {
"additional_compile_targets": [ "additional_compile_targets": [
"cast_browser_apk",
"cast_junit_test_lists", "cast_junit_test_lists",
"cast_shell_apk",
"cast_test_lists" "cast_test_lists"
], ],
"gtest_tests": [ "gtest_tests": [

@ -1,8 +1,8 @@
{ {
"android-cast-arm-rel": { "android-cast-arm-rel": {
"additional_compile_targets": [ "additional_compile_targets": [
"cast_browser_apk",
"cast_junit_test_lists", "cast_junit_test_lists",
"cast_shell_apk",
"cast_test_lists" "cast_test_lists"
], ],
"gtest_tests": [ "gtest_tests": [

@ -1,8 +1,8 @@
{ {
"android-cast-arm64-dbg": { "android-cast-arm64-dbg": {
"additional_compile_targets": [ "additional_compile_targets": [
"cast_browser_apk",
"cast_junit_test_lists", "cast_junit_test_lists",
"cast_shell_apk",
"cast_test_lists" "cast_test_lists"
], ],
"gtest_tests": [ "gtest_tests": [

@ -1,8 +1,8 @@
{ {
"android-cast-arm64-rel": { "android-cast-arm64-rel": {
"additional_compile_targets": [ "additional_compile_targets": [
"cast_browser_apk",
"cast_junit_test_lists", "cast_junit_test_lists",
"cast_shell_apk",
"cast_test_lists" "cast_test_lists"
], ],
"gtest_tests": [ "gtest_tests": [

@ -1,8 +1,8 @@
{ {
"android-cast-arm-dbg": { "android-cast-arm-dbg": {
"additional_compile_targets": [ "additional_compile_targets": [
"cast_browser_apk",
"cast_junit_test_lists", "cast_junit_test_lists",
"cast_shell_apk",
"cast_test_lists" "cast_test_lists"
], ],
"gtest_tests": [ "gtest_tests": [

@ -1,8 +1,8 @@
{ {
"android-cast-arm-rel": { "android-cast-arm-rel": {
"additional_compile_targets": [ "additional_compile_targets": [
"cast_browser_apk",
"cast_junit_test_lists", "cast_junit_test_lists",
"cast_shell_apk",
"cast_test_lists" "cast_test_lists"
], ],
"gtest_tests": [ "gtest_tests": [

@ -1,8 +1,8 @@
{ {
"android-cast-arm64-dbg": { "android-cast-arm64-dbg": {
"additional_compile_targets": [ "additional_compile_targets": [
"cast_browser_apk",
"cast_junit_test_lists", "cast_junit_test_lists",
"cast_shell_apk",
"cast_test_lists" "cast_test_lists"
], ],
"gtest_tests": [ "gtest_tests": [

@ -1,8 +1,8 @@
{ {
"android-cast-arm64-rel": { "android-cast-arm64-rel": {
"additional_compile_targets": [ "additional_compile_targets": [
"cast_browser_apk",
"cast_junit_test_lists", "cast_junit_test_lists",
"cast_shell_apk",
"cast_test_lists" "cast_test_lists"
], ],
"gtest_tests": [ "gtest_tests": [

@ -1,8 +1,8 @@
{ {
"Cast Android (dbg)": { "Cast Android (dbg)": {
"additional_compile_targets": [ "additional_compile_targets": [
"cast_junit_test_lists", "cast_browser_apk",
"cast_shell_apk" "cast_junit_test_lists"
], ],
"isolated_scripts": [ "isolated_scripts": [
{ {

@ -253,6 +253,10 @@
"label": "//chromecast/base:cast_base_unittests", "label": "//chromecast/base:cast_base_unittests",
"type": "console_test_launcher", "type": "console_test_launcher",
}, },
"cast_browser_apk": {
"label": "//chromecast:cast_browser_apk",
"type": "additional_compile_target",
},
"cast_cast_core_unittests": { "cast_cast_core_unittests": {
"label": "//chromecast/cast_core:cast_cast_core_unittests", "label": "//chromecast/cast_core:cast_cast_core_unittests",
"type": "console_test_launcher", "type": "console_test_launcher",
@ -297,10 +301,6 @@
"label": "//chromecast:cast_shell", "label": "//chromecast:cast_shell",
"type": "additional_compile_target", "type": "additional_compile_target",
}, },
"cast_shell_apk": {
"label": "//chromecast:cast_shell_apk",
"type": "additional_compile_target",
},
"cast_shell_browsertests": { "cast_shell_browsertests": {
"label": "//chromecast:cast_shell_browsertests", "label": "//chromecast:cast_shell_browsertests",
"type": "console_test_launcher", "type": "console_test_launcher",

@ -624,7 +624,7 @@ ci.builder(
], ],
additional_compile_targets = [ additional_compile_targets = [
"cast_junit_test_lists", "cast_junit_test_lists",
"cast_shell_apk", "cast_browser_apk",
], ],
mixins = [ mixins = [
"has_native_resultdb_integration", "has_native_resultdb_integration",

@ -670,7 +670,7 @@ targets.bundle(
targets.bundle( targets.bundle(
name = "chromium_android_cast_receiver", name = "chromium_android_cast_receiver",
additional_compile_targets = [ additional_compile_targets = [
"cast_shell_apk", "cast_browser_apk",
], ],
) )

@ -54,8 +54,8 @@ targets.compile_target(
) )
targets.compile_target( targets.compile_target(
name = "cast_shell_apk", name = "cast_browser_apk",
label = "//chromecast:cast_shell_apk", label = "//chromecast:cast_browser_apk",
) )
targets.compile_target( targets.compile_target(

@ -45,7 +45,7 @@ SKIP_GN_ISOLATE_MAP_TARGETS = {
'cast_junit_test_lists', 'cast_junit_test_lists',
'cast_media_unittests', 'cast_media_unittests',
'cast_shell', 'cast_shell',
'cast_shell_apk', 'cast_browser_apk',
'cast_shell_browsertests', 'cast_shell_browsertests',
'cast_shell_junit_tests', 'cast_shell_junit_tests',
'cast_shell_unittests', 'cast_shell_unittests',

@ -3130,7 +3130,7 @@
}, },
"Cast Android (dbg)": { "Cast Android (dbg)": {
"additional_compile_targets": [ "additional_compile_targets": [
"cast_shell_apk" "cast_browser_apk"
] ]
}, },
"Cast Audio Linux": { "Cast Audio Linux": {
@ -5195,4 +5195,4 @@
} }
] ]
} }
} }