| OLD | NEW |
| 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 12 matching lines...) Expand all Loading... |
| 23 ], | 23 ], |
| 24 }], | 24 }], |
| 25 # TODO(jschuh): Remove this after crbug.com/173851 gets fixed. | 25 # TODO(jschuh): Remove this after crbug.com/173851 gets fixed. |
| 26 ['OS=="win" and target_arch=="x64"', { | 26 ['OS=="win" and target_arch=="x64"', { |
| 27 'msvs_settings': { | 27 'msvs_settings': { |
| 28 'VCCLCompilerTool': { | 28 'VCCLCompilerTool': { |
| 29 'AdditionalOptions': ['/bigobj'], | 29 'AdditionalOptions': ['/bigobj'], |
| 30 }, | 30 }, |
| 31 }, | 31 }, |
| 32 }], | 32 }], |
| 33 | |
| 34 ], | 33 ], |
| 35 }, | 34 }, |
| 36 'conditions': [ | 35 'conditions': [ |
| 37 ['inside_chromium_build==1', { | 36 ['inside_chromium_build==1', { |
| 38 'includes': [ | 37 'includes': [ |
| 39 'content_tests.gypi', | 38 'content_tests.gypi', |
| 40 ], | 39 ], |
| 41 }], | 40 }], |
| 42 ['OS != "ios"', { | 41 ['OS != "ios"', { |
| 43 'includes': [ | 42 'includes': [ |
| (...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 315 'result_codes_java', | 314 'result_codes_java', |
| 316 ], | 315 ], |
| 317 'variables': { | 316 'variables': { |
| 318 'java_in_dir': '../content/public/android/java', | 317 'java_in_dir': '../content/public/android/java', |
| 319 'has_java_resources': 1, | 318 'has_java_resources': 1, |
| 320 'R_package': 'org.chromium.content', | 319 'R_package': 'org.chromium.content', |
| 321 'R_package_relpath': 'org/chromium/content', | 320 'R_package_relpath': 'org/chromium/content', |
| 322 'java_strings_grd': 'android_content_strings.grd', | 321 'java_strings_grd': 'android_content_strings.grd', |
| 323 }, | 322 }, |
| 324 'conditions': [ | 323 'conditions': [ |
| 325 ['android_build_type == 0', { | 324 ['android_webview_build == 0', { |
| 326 'dependencies': [ | 325 'dependencies': [ |
| 327 '../third_party/eyesfree/eyesfree.gyp:eyesfree_java', | 326 '../third_party/eyesfree/eyesfree.gyp:eyesfree_java', |
| 328 '../third_party/guava/guava.gyp:guava_javalib', | 327 '../third_party/guava/guava.gyp:guava_javalib', |
| 329 ], | 328 ], |
| 330 }], | 329 }], |
| 331 ], | 330 ], |
| 332 'includes': [ '../build/java.gypi' ], | 331 'includes': [ '../build/java.gypi' ], |
| 333 }, | 332 }, |
| 334 { | 333 { |
| 335 'target_name': 'page_transition_types_java', | 334 'target_name': 'page_transition_types_java', |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 398 'include_dirs': [ | 397 'include_dirs': [ |
| 399 '<(SHARED_INTERMEDIATE_DIR)/content', | 398 '<(SHARED_INTERMEDIATE_DIR)/content', |
| 400 ], | 399 ], |
| 401 }, | 400 }, |
| 402 'includes': [ 'content_jni.gypi' ], | 401 'includes': [ 'content_jni.gypi' ], |
| 403 }, | 402 }, |
| 404 ], | 403 ], |
| 405 }], # OS == "android" | 404 }], # OS == "android" |
| 406 ], | 405 ], |
| 407 } | 406 } |
| OLD | NEW |