summaryrefslogtreecommitdiffstats
path: root/chromecast/base/BUILD.gn
diff options
context:
space:
mode:
authoryucliu <yucliu@chromium.org>2015-07-30 14:09:08 -0700
committerCommit bot <commit-bot@chromium.org>2015-07-30 21:09:38 +0000
commit48ba4153e0cdc5c8843dcbfc8eadd8f71d08c250 (patch)
tree5479475b2b3411ac3f1d451cce0227e91c25838c /chromecast/base/BUILD.gn
parent4e11ceb0ec7227af107222b9d7fa1a634e52a716 (diff)
downloadchromium_src-48ba4153e0cdc5c8843dcbfc8eadd8f71d08c250.zip
chromium_src-48ba4153e0cdc5c8843dcbfc8eadd8f71d08c250.tar.gz
chromium_src-48ba4153e0cdc5c8843dcbfc8eadd8f71d08c250.tar.bz2
Reland of [Chromecast] Change chromecast_branding to public (patchset #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 #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}
Diffstat (limited to 'chromecast/base/BUILD.gn')
-rw-r--r--chromecast/base/BUILD.gn2
1 files changed, 1 insertions, 1 deletions
diff --git a/chromecast/base/BUILD.gn b/chromecast/base/BUILD.gn
index c27a4c5..a249ec8 100644
--- a/chromecast/base/BUILD.gn
+++ b/chromecast/base/BUILD.gn
@@ -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" ]
}