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

Side by Side Diff: chromecast/chromecast.gyp

Issue 970413002: Change chrome android to use content_app_both (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 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 | « chrome/chrome_shell.gypi ('k') | no next file » | 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 'chromium_code': 1, 10 'chromium_code': 1,
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 '../components/components.gyp:cdm_renderer', 167 '../components/components.gyp:cdm_renderer',
168 '../components/components.gyp:component_metrics_proto', 168 '../components/components.gyp:component_metrics_proto',
169 '../components/components.gyp:crash_component', 169 '../components/components.gyp:crash_component',
170 '../components/components.gyp:network_hints_browser', 170 '../components/components.gyp:network_hints_browser',
171 '../components/components.gyp:network_hints_renderer', 171 '../components/components.gyp:network_hints_renderer',
172 '../components/components.gyp:metrics', 172 '../components/components.gyp:metrics',
173 '../components/components.gyp:metrics_gpu', 173 '../components/components.gyp:metrics_gpu',
174 '../components/components.gyp:metrics_net', 174 '../components/components.gyp:metrics_net',
175 '../components/components.gyp:metrics_profiler', 175 '../components/components.gyp:metrics_profiler',
176 '../content/content.gyp:content', 176 '../content/content.gyp:content',
177 '../content/content.gyp:content_app_browser', 177 '../content/content.gyp:content_app_both',
gunsch 2015/03/04 04:36:09 This target is also build by the Linux cast_shell,
178 '../skia/skia.gyp:skia', 178 '../skia/skia.gyp:skia',
179 '../third_party/WebKit/public/blink.gyp:blink', 179 '../third_party/WebKit/public/blink.gyp:blink',
180 '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h', 180 '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h',
181 ], 181 ],
182 'sources': [ 182 'sources': [
183 'app/cast_main_delegate.cc', 183 'app/cast_main_delegate.cc',
184 'app/cast_main_delegate.h', 184 'app/cast_main_delegate.h',
185 'browser/cast_browser_context.cc', 185 'browser/cast_browser_context.cc',
186 'browser/cast_browser_context.h', 186 'browser/cast_browser_context.h',
187 'browser/cast_browser_main_parts.cc', 187 'browser/cast_browser_main_parts.cc',
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
346 'dependencies': [ 346 'dependencies': [
347 'cast_jni_headers', 347 'cast_jni_headers',
348 'cast_shell_common', 348 'cast_shell_common',
349 'cast_shell_icudata', 349 'cast_shell_icudata',
350 'cast_shell_pak', 350 'cast_shell_pak',
351 'cast_version_header', 351 'cast_version_header',
352 '../base/base.gyp:base', 352 '../base/base.gyp:base',
353 '../breakpad/breakpad.gyp:breakpad_client', 353 '../breakpad/breakpad.gyp:breakpad_client',
354 '../components/components.gyp:breakpad_host', 354 '../components/components.gyp:breakpad_host',
355 '../components/components.gyp:crash_component', 355 '../components/components.gyp:crash_component',
356 '../content/content.gyp:content_app_browser',
357 '../content/content.gyp:content', 356 '../content/content.gyp:content',
358 '../skia/skia.gyp:skia', 357 '../skia/skia.gyp:skia',
359 '../ui/gfx/gfx.gyp:gfx', 358 '../ui/gfx/gfx.gyp:gfx',
360 '../ui/gl/gl.gyp:gl', 359 '../ui/gl/gl.gyp:gl',
361 ], 360 ],
362 'include_dirs': [ 361 'include_dirs': [
363 '../breakpad/src', 362 '../breakpad/src',
364 ], 363 ],
365 'sources': [ 364 'sources': [
366 'android/cast_jni_registrar.cc', 365 'android/cast_jni_registrar.cc',
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
544 # TODO(dougsteed): remove when Chromecast moves to boringssl. 543 # TODO(dougsteed): remove when Chromecast moves to boringssl.
545 # Allow the cast shell to find the NSS module in the same directory. 544 # Allow the cast shell to find the NSS module in the same directory.
546 'ldflags': [ 545 'ldflags': [
547 '-Wl,-rpath=\$$ORIGIN' 546 '-Wl,-rpath=\$$ORIGIN'
548 ], 547 ],
549 }, 548 },
550 ], # end of targets 549 ], # end of targets
551 }], 550 }],
552 ], # end of conditions 551 ], # end of conditions
553 } 552 }
OLDNEW
« no previous file with comments | « chrome/chrome_shell.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698