Skip to content

Commit

Permalink
Reland of [Chromecast] Change chromecast_branding to public (patchset c…
Browse files Browse the repository at this point in the history 
…hromium#1 id:1 of https://codereview.chromium.org/1266723002/)

Reason for revert:
retrieve the branding change CL since internal CL is submitted.

Original issue's description:
> Revert of [Chromecast] Change chromecast_branding to public (patchset chromium#6 id:100001 of https://codereview.chromium.org/1262673004/)
>
> Reason for revert:
> Revert the CL temporary for TOT build. Checked in again once the internal CLs are approved.
>
> Original issue's description:
> > [Chromecast] Change chromecast_branding to public
> >
> > Change chromecast_branding from Chrome/Chromium to
> > public/internal/google in gyp file. "public" is the same as "Chromium"
> > and the other two are considered as "Chrome".
> >
> > BUG=
> >
> > Committed: https://crrev.com/0f46bd94566380a99ecda0753f659b7e114e3d3d
> > Cr-Commit-Position: refs/heads/master@{#341016}
>
> TBR=lcwu@chromium.org,gunsch@chromium.org,byungchul@chromium.org,slan@chromium.org
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=
>
> Committed: https://crrev.com/cc83429750aac56eef9068fcd617d4474d310960
> Cr-Commit-Position: refs/heads/master@{#341034}

TBR=lcwu@chromium.org,gunsch@chromium.org,byungchul@chromium.org,slan@chromium.org,gunsch@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=

Review URL: https://codereview.chromium.org/1256323009

Cr-Commit-Position: refs/heads/master@{#341191}
  • Loading branch information
yucliu authored and Commit bot committed Jul 30, 2015
1 parent 4e11ceb commit 48ba415
Show file tree
Hide file tree
Showing 8 changed files with 27 additions and 21 deletions.
2 changes: 1 addition & 1 deletion chromecast/base/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ source_set("cast_sys_info") {
"cast_sys_info_util.h",
]

if (!is_chromecast_chrome_branded && !is_android) {
if (chromecast_branding == "public" && !is_android) {
sources += [ "cast_sys_info_util_simple.cc" ]
}

Expand Down
6 changes: 4 additions & 2 deletions chromecast/chromecast.gni
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@
# found in the LICENSE file.

declare_args() {
# is_chromecast_chrome_branded is set to true for an official build
is_chromecast_chrome_branded = false
# chromecast_branding is used to indicate build version. Set it to
# "public" for Chromium build.
# TODO(slan): Make this variable consistent with the GYP build.
chromecast_branding = "public"

use_playready = false
}
12 changes: 6 additions & 6 deletions chromecast/chromecast.gyp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
# Refers to enum CastProductType in components/metrics/proto/cast_logs.proto
'cast_product_type%': 0, # CAST_PRODUCT_TYPE_UNKNOWN
'chromium_code': 1,
'chromecast_branding%': 'Chromium',
'chromecast_branding%': 'public',
'disable_display%': 0,
'enable_default_cast_graphics%': 1,
'ozone_platform_cast%': 0,
Expand Down Expand Up @@ -222,7 +222,7 @@
'<(SHARED_INTERMEDIATE_DIR)/ui/strings/ui_strings_en-US.pak',
],
'conditions': [
['chromecast_branding=="Chrome" and use_chromecast_webui==1', {
['chromecast_branding!="public" and use_chromecast_webui==1', {
'pak_inputs': [
'<(SHARED_INTERMEDIATE_DIR)/chromecast/app_resources.pak',
'<(SHARED_INTERMEDIATE_DIR)/chromecast/cast_webui_resources.pak',
Expand All @@ -235,7 +235,7 @@
},
],
'conditions': [
['chromecast_branding=="Chrome" and use_chromecast_webui==1', {
['chromecast_branding!="public" and use_chromecast_webui==1', {
'dependencies': [
'internal/chromecast_resources.gyp:chromecast_app_resources',
'internal/chromecast_resources.gyp:chromecast_webui_resources',
Expand Down Expand Up @@ -353,7 +353,7 @@
'renderer/media/capabilities_message_filter.h',
],
'conditions': [
['chromecast_branding=="Chrome"', {
['chromecast_branding!="public"', {
'dependencies': [
'internal/chromecast_internal.gyp:cast_shell_internal',
],
Expand Down Expand Up @@ -421,7 +421,7 @@
'cast_jni_headers',
],
}],
['chromecast_branding!="Chrome" and OS!="android"', {
['chromecast_branding=="public" and OS!="android"', {
'sources': [
'base/cast_sys_info_util_simple.cc',
],
Expand Down Expand Up @@ -516,7 +516,7 @@
'app/android/cast_jni_loader.cc',
],
'conditions': [
['chromecast_branding=="Chrome"', {
['chromecast_branding!="public"', {
'dependencies': [
'internal/chromecast_internal.gyp:cast_shell_android_internal'
],
Expand Down
4 changes: 2 additions & 2 deletions chromecast/chromecast_locales.gyp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

{
'variables': {
'chromecast_branding%': 'Chromium',
'chromecast_branding%': 'public',
'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chromecast_strings',
},
'targets': [
Expand All @@ -30,7 +30,7 @@
'chromecast_settings',
],
'conditions': [
['chromecast_branding=="Chrome"', {
['chromecast_branding!="public"', {
'dependencies': [
'internal/chromecast_locales.gyp:chromecast_app_strings',
],
Expand Down
4 changes: 2 additions & 2 deletions chromecast/chromecast_tests.gypi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
'cast_test_generator',
],
'conditions': [
['chromecast_branding=="Chrome"', {
['chromecast_branding!="public"', {
'dependencies': [
'internal/chromecast_internal.gyp:cast_tests_internal',
],
Expand Down Expand Up @@ -230,7 +230,7 @@
'type': 'none',
'dependencies': ['cast_android_tests_generator'],
'conditions': [
['chromecast_branding=="Chrome"', {
['chromecast_branding!="public"', {
'dependencies': [
'internal/chromecast_internal.gyp:cast_android_tests_internal',
],
Expand Down
2 changes: 1 addition & 1 deletion chromecast/media/base/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ source_set("base") {
"//third_party/widevine/cdm:version_h",
]

if (is_chromecast_chrome_branded) {
if (chromecast_branding != "public") {
deps += [
"${libcast_media_target}",
# TODO(gyp): add dependency on internal/chromecast_internal:media_base_internal
Expand Down
6 changes: 3 additions & 3 deletions chromecast/media/media.gyp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
{
'variables': {
'chromium_code': 1,
'chromecast_branding%': 'Chromium',
'chromecast_branding%': 'public',
'libcast_media_gyp%': '',
'use_default_libcast_media%': 1,
},
Expand Down Expand Up @@ -43,7 +43,7 @@
'base/switching_media_renderer.h',
],
'conditions': [
['chromecast_branding=="Chrome"', {
['chromecast_branding!="public"', {
'dependencies': [
'../internal/chromecast_internal.gyp:media_base_internal',
],
Expand Down Expand Up @@ -152,7 +152,7 @@
'cma/backend/video_pipeline_device.h',
],
'conditions': [
['chromecast_branding=="Chrome"', {
['chromecast_branding!="public"', {
'dependencies': [
'../internal/chromecast_internal.gyp:cma_backend_internal',
],
Expand Down
12 changes: 8 additions & 4 deletions chromecast/tools/build/chromecast_repack_locales.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def calc_output(locale):
def calc_inputs(locale):
"""Determine the files that need processing for the given locale."""
inputs = []
if CHROMECAST_BRANDING == 'Chrome':
if CHROMECAST_BRANDING != 'public':
inputs.append(os.path.join(GRIT_DIR, 'app_strings_%s.pak' % locale))
inputs.append(os.path.join(GRIT_DIR, 'chromecast_settings_%s.pak' % locale))
return inputs
Expand Down Expand Up @@ -99,7 +99,8 @@ def DoMain(argv):
parser.add_option("-x", action="store", dest="int_dir",
help="Intermediate build files output directory.")
parser.add_option("-b", action="store", dest="chromecast_branding",
help="Chromecast branding ('Chrome' or 'Chromium').")
help="Chromecast branding " +
"('public', 'internal' or 'google').")
options, locales = parser.parse_args(argv)

if not locales:
Expand All @@ -111,8 +112,11 @@ def DoMain(argv):
INT_DIR = options.int_dir
CHROMECAST_BRANDING = options.chromecast_branding

if CHROMECAST_BRANDING != "Chrome" and CHROMECAST_BRANDING != "Chromium":
parser.error('Chromecast branding (-b) must be "Chrome" or "Chromium".\n')
if (CHROMECAST_BRANDING != 'public' and
CHROMECAST_BRANDING != 'internal' and
CHROMECAST_BRANDING != 'google'):
parser.error('Chromecast branding (-b) must be ' +
'"public", "internal" or "google".\n')
if not (GRIT_DIR and INT_DIR):
parser.error('Please specify all of "-g" and "-x".\n')
if print_inputs and print_outputs:
Expand Down

0 comments on commit 48ba415

Please sign in to comment.