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

Side by Side Diff: content/content.gyp

Issue 12464004: Handle LibraryLoader error from the renderer process. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase gypi Created 7 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 | Annotate | Revision Log
« no previous file with comments | « build/android/java_cpp_template.gypi ('k') | content/content_common.gypi » ('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 (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 'chromium_code': 1, # Use higher warning level. 7 'chromium_code': 1, # Use higher warning level.
8 'directxsdk_exists': '<!(python <(DEPTH)/build/dir_exists.py ../third_party/ directxsdk)', 8 'directxsdk_exists': '<!(python <(DEPTH)/build/dir_exists.py ../third_party/ directxsdk)',
9 'conditions': [ 9 'conditions': [
10 ['inside_chromium_build==0', { 10 ['inside_chromium_build==0', {
(...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after
305 'target_name': 'content_java', 305 'target_name': 'content_java',
306 'type': 'none', 306 'type': 'none',
307 'dependencies': [ 307 'dependencies': [
308 '../base/base.gyp:base', 308 '../base/base.gyp:base',
309 '../media/media.gyp:media_java', 309 '../media/media.gyp:media_java',
310 '../net/net.gyp:net', 310 '../net/net.gyp:net',
311 '../ui/ui.gyp:ui_java', 311 '../ui/ui.gyp:ui_java',
312 'common_aidl', 312 'common_aidl',
313 'content_common', 313 'content_common',
314 'page_transition_types_java', 314 'page_transition_types_java',
315 'result_codes_java',
315 ], 316 ],
316 'variables': { 317 'variables': {
317 'java_in_dir': '../content/public/android/java', 318 'java_in_dir': '../content/public/android/java',
318 'has_java_resources': 1, 319 'has_java_resources': 1,
319 'R_package': 'org.chromium.content', 320 'R_package': 'org.chromium.content',
320 'R_package_relpath': 'org/chromium/content', 321 'R_package_relpath': 'org/chromium/content',
321 'java_strings_grd': 'android_content_strings.grd', 322 'java_strings_grd': 'android_content_strings.grd',
322 }, 323 },
323 'conditions': [ 324 'conditions': [
324 ['android_build_type == 0', { 325 ['android_build_type == 0', {
(...skipping 11 matching lines...) Expand all
336 'sources': [ 337 'sources': [
337 'public/android/java/src/org/chromium/content/browser/PageTransition Types.template', 338 'public/android/java/src/org/chromium/content/browser/PageTransition Types.template',
338 ], 339 ],
339 'variables': { 340 'variables': {
340 'package_name': 'org/chromium/content/browser', 341 'package_name': 'org/chromium/content/browser',
341 'template_deps': ['public/common/page_transition_types_list.h'], 342 'template_deps': ['public/common/page_transition_types_list.h'],
342 }, 343 },
343 'includes': [ '../build/android/java_cpp_template.gypi' ], 344 'includes': [ '../build/android/java_cpp_template.gypi' ],
344 }, 345 },
345 { 346 {
347 'target_name': 'result_codes_java',
348 'type': 'none',
349 'sources': [
350 'public/android/java/src/org/chromium/content/common/ResultCodes.tem plate',
351 ],
352 'variables': {
353 'package_name': 'org/chromium/content/common',
354 'template_deps': ['public/common/result_codes_list.h'],
355 },
356 'includes': [ '../build/android/java_cpp_template.gypi' ],
357 },
358 {
346 'target_name': 'surface_texture_jni_headers', 359 'target_name': 'surface_texture_jni_headers',
347 'type': 'none', 360 'type': 'none',
348 'variables': { 361 'variables': {
349 'jni_gen_dir': 'content', 362 'jni_gen_dir': 'content',
350 'input_java_class': 'android/graphics/SurfaceTexture.class', 363 'input_java_class': 'android/graphics/SurfaceTexture.class',
351 'input_jar_file': '<(android_sdk)/android.jar', 364 'input_jar_file': '<(android_sdk)/android.jar',
352 }, 365 },
353 'includes': [ '../build/jar_file_jni_generator.gypi' ], 366 'includes': [ '../build/jar_file_jni_generator.gypi' ],
354 }, 367 },
355 { 368 {
(...skipping 29 matching lines...) Expand all
385 'include_dirs': [ 398 'include_dirs': [
386 '<(SHARED_INTERMEDIATE_DIR)/content', 399 '<(SHARED_INTERMEDIATE_DIR)/content',
387 ], 400 ],
388 }, 401 },
389 'includes': [ 'content_jni.gypi' ], 402 'includes': [ 'content_jni.gypi' ],
390 }, 403 },
391 ], 404 ],
392 }], # OS == "android" 405 }], # OS == "android"
393 ], 406 ],
394 } 407 }
OLDNEW
« no previous file with comments | « build/android/java_cpp_template.gypi ('k') | content/content_common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698