Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(275)

Side by Side Diff: chromecast/chromecast.gyp

Issue 1266723002: Revert of [Chromecast] Change chromecast_branding to public (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chromecast/chromecast.gni ('k') | chromecast/chromecast_locales.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'android_support_v13_target%': 7 'android_support_v13_target%':
8 '../third_party/android_tools/android_tools.gyp:android_support_v13_java lib', 8 '../third_party/android_tools/android_tools.gyp:android_support_v13_java lib',
9 'cast_build_release': 'internal/build/cast_build_release', 9 'cast_build_release': 'internal/build/cast_build_release',
10 'cast_is_debug_build%': 0, 10 'cast_is_debug_build%': 0,
11 # Refers to enum CastProductType in components/metrics/proto/cast_logs.proto 11 # Refers to enum CastProductType in components/metrics/proto/cast_logs.proto
12 'cast_product_type%': 0, # CAST_PRODUCT_TYPE_UNKNOWN 12 'cast_product_type%': 0, # CAST_PRODUCT_TYPE_UNKNOWN
13 'chromium_code': 1, 13 'chromium_code': 1,
14 'chromecast_branding%': 'public', 14 'chromecast_branding%': 'Chromium',
15 'disable_display%': 0, 15 'disable_display%': 0,
16 'enable_default_cast_graphics%': 1, 16 'enable_default_cast_graphics%': 1,
17 'ozone_platform_cast%': 0, 17 'ozone_platform_cast%': 0,
18 'use_chromecast_webui%': 0, 18 'use_chromecast_webui%': 0,
19 }, 19 },
20 'includes': [ 20 'includes': [
21 'chromecast_tests.gypi', 21 'chromecast_tests.gypi',
22 ], 22 ],
23 'target_defaults': { 23 'target_defaults': {
24 'include_dirs': [ 24 'include_dirs': [
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
215 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak', 215 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak',
216 '<(SHARED_INTERMEDIATE_DIR)/content/app/resources/content_resource s_100_percent.pak', 216 '<(SHARED_INTERMEDIATE_DIR)/content/app/resources/content_resource s_100_percent.pak',
217 '<(SHARED_INTERMEDIATE_DIR)/content/app/strings/content_strings_en -US.pak', 217 '<(SHARED_INTERMEDIATE_DIR)/content/app/strings/content_strings_en -US.pak',
218 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak', 218 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
219 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_100_percent. pak', 219 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_100_percent. pak',
220 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/webui_resources.pak', 220 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/webui_resources.pak',
221 '<(SHARED_INTERMEDIATE_DIR)/ui/strings/app_locale_settings_en-US.p ak', 221 '<(SHARED_INTERMEDIATE_DIR)/ui/strings/app_locale_settings_en-US.p ak',
222 '<(SHARED_INTERMEDIATE_DIR)/ui/strings/ui_strings_en-US.pak', 222 '<(SHARED_INTERMEDIATE_DIR)/ui/strings/ui_strings_en-US.pak',
223 ], 223 ],
224 'conditions': [ 224 'conditions': [
225 ['chromecast_branding!="public" and use_chromecast_webui==1', { 225 ['chromecast_branding=="Chrome" and use_chromecast_webui==1', {
226 'pak_inputs': [ 226 'pak_inputs': [
227 '<(SHARED_INTERMEDIATE_DIR)/chromecast/app_resources.pak', 227 '<(SHARED_INTERMEDIATE_DIR)/chromecast/app_resources.pak',
228 '<(SHARED_INTERMEDIATE_DIR)/chromecast/cast_webui_resources.pa k', 228 '<(SHARED_INTERMEDIATE_DIR)/chromecast/cast_webui_resources.pa k',
229 ], 229 ],
230 }], 230 }],
231 ], 231 ],
232 'pak_output': '<(PRODUCT_DIR)/assets/cast_shell.pak', 232 'pak_output': '<(PRODUCT_DIR)/assets/cast_shell.pak',
233 }, 233 },
234 'includes': [ '../build/repack_action.gypi' ], 234 'includes': [ '../build/repack_action.gypi' ],
235 }, 235 },
236 ], 236 ],
237 'conditions': [ 237 'conditions': [
238 ['chromecast_branding!="public" and use_chromecast_webui==1', { 238 ['chromecast_branding=="Chrome" and use_chromecast_webui==1', {
239 'dependencies': [ 239 'dependencies': [
240 'internal/chromecast_resources.gyp:chromecast_app_resources', 240 'internal/chromecast_resources.gyp:chromecast_app_resources',
241 'internal/chromecast_resources.gyp:chromecast_webui_resources', 241 'internal/chromecast_resources.gyp:chromecast_webui_resources',
242 ], 242 ],
243 }], 243 }],
244 ], 244 ],
245 }, # end of target 'cast_shell_pak' 245 }, # end of target 'cast_shell_pak'
246 # This target contains all content-embedder implementation that is 246 # This target contains all content-embedder implementation that is
247 # non-platform-specific. 247 # non-platform-specific.
248 { 248 {
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
346 'renderer/cast_media_load_deferrer.cc', 346 'renderer/cast_media_load_deferrer.cc',
347 'renderer/cast_media_load_deferrer.h', 347 'renderer/cast_media_load_deferrer.h',
348 'renderer/cast_render_process_observer.cc', 348 'renderer/cast_render_process_observer.cc',
349 'renderer/cast_render_process_observer.h', 349 'renderer/cast_render_process_observer.h',
350 'renderer/key_systems_cast.cc', 350 'renderer/key_systems_cast.cc',
351 'renderer/key_systems_cast.h', 351 'renderer/key_systems_cast.h',
352 'renderer/media/capabilities_message_filter.cc', 352 'renderer/media/capabilities_message_filter.cc',
353 'renderer/media/capabilities_message_filter.h', 353 'renderer/media/capabilities_message_filter.h',
354 ], 354 ],
355 'conditions': [ 355 'conditions': [
356 ['chromecast_branding!="public"', { 356 ['chromecast_branding=="Chrome"', {
357 'dependencies': [ 357 'dependencies': [
358 'internal/chromecast_internal.gyp:cast_shell_internal', 358 'internal/chromecast_internal.gyp:cast_shell_internal',
359 ], 359 ],
360 }, { 360 }, {
361 'sources': [ 361 'sources': [
362 'browser/cast_content_browser_client_simple.cc', 362 'browser/cast_content_browser_client_simple.cc',
363 'browser/cast_network_delegate_simple.cc', 363 'browser/cast_network_delegate_simple.cc',
364 'browser/devtools/remote_debugging_server_simple.cc', 364 'browser/devtools/remote_debugging_server_simple.cc',
365 'browser/metrics/platform_metrics_providers_simple.cc', 365 'browser/metrics/platform_metrics_providers_simple.cc',
366 'browser/pref_service_helper_simple.cc', 366 'browser/pref_service_helper_simple.cc',
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
414 'base/cast_sys_info_dummy.h', 414 'base/cast_sys_info_dummy.h',
415 'base/cast_sys_info_android.cc', 415 'base/cast_sys_info_android.cc',
416 'base/cast_sys_info_android.h', 416 'base/cast_sys_info_android.h',
417 ], 417 ],
418 'conditions': [ 418 'conditions': [
419 ['OS=="android"', { 419 ['OS=="android"', {
420 'dependencies': [ 420 'dependencies': [
421 'cast_jni_headers', 421 'cast_jni_headers',
422 ], 422 ],
423 }], 423 }],
424 ['chromecast_branding=="public" and OS!="android"', { 424 ['chromecast_branding!="Chrome" and OS!="android"', {
425 'sources': [ 425 'sources': [
426 'base/cast_sys_info_util_simple.cc', 426 'base/cast_sys_info_util_simple.cc',
427 ], 427 ],
428 }], 428 }],
429 ], 429 ],
430 }, # end of target 'cast_sys_info' 430 }, # end of target 'cast_sys_info'
431 { 431 {
432 'target_name': 'cast_version_header', 432 'target_name': 'cast_version_header',
433 'type': 'none', 433 'type': 'none',
434 'direct_dependent_settings': { 434 'direct_dependent_settings': {
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
509 ], 509 ],
510 'sources': [ 510 'sources': [
511 'android/cast_jni_registrar.cc', 511 'android/cast_jni_registrar.cc',
512 'android/cast_jni_registrar.h', 512 'android/cast_jni_registrar.h',
513 'android/cast_metrics_helper_android.cc', 513 'android/cast_metrics_helper_android.cc',
514 'android/cast_metrics_helper_android.h', 514 'android/cast_metrics_helper_android.h',
515 'android/platform_jni_loader.h', 515 'android/platform_jni_loader.h',
516 'app/android/cast_jni_loader.cc', 516 'app/android/cast_jni_loader.cc',
517 ], 517 ],
518 'conditions': [ 518 'conditions': [
519 ['chromecast_branding!="public"', { 519 ['chromecast_branding=="Chrome"', {
520 'dependencies': [ 520 'dependencies': [
521 'internal/chromecast_internal.gyp:cast_shell_android_internal' 521 'internal/chromecast_internal.gyp:cast_shell_android_internal'
522 ], 522 ],
523 }, { 523 }, {
524 'sources': [ 524 'sources': [
525 'android/platform_jni_loader_stub.cc', 525 'android/platform_jni_loader_stub.cc',
526 ], 526 ],
527 }] 527 }]
528 ], 528 ],
529 }, # end of target 'libcast_shell_android' 529 }, # end of target 'libcast_shell_android'
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
710 'sources': [ 710 'sources': [
711 'graphics/cast_egl_platform_default.cc', 711 'graphics/cast_egl_platform_default.cc',
712 'graphics/graphics_properties_default.cc', 712 'graphics/graphics_properties_default.cc',
713 'graphics/osd_plane_default.cc' 713 'graphics/osd_plane_default.cc'
714 ], 714 ],
715 } 715 }
716 ] 716 ]
717 }], 717 }],
718 ], # end of conditions 718 ], # end of conditions
719 } 719 }
OLDNEW
« no previous file with comments | « chromecast/chromecast.gni ('k') | chromecast/chromecast_locales.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698