| 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 # IMPORTANT: | 5 # IMPORTANT: |
| 6 # Please don't directly include this file if you are building via gyp_chromium, | 6 # Please don't directly include this file if you are building via gyp_chromium, |
| 7 # since gyp_chromium is automatically forcing its inclusion. | 7 # since gyp_chromium is automatically forcing its inclusion. |
| 8 { | 8 { |
| 9 # Variables expected to be overriden on the GYP command line (-D) or by | 9 # Variables expected to be overriden on the GYP command line (-D) or by |
| 10 # ~/.gyp/include.gypi. | 10 # ~/.gyp/include.gypi. |
| (...skipping 474 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 485 'enable_extensions%': 0, | 485 'enable_extensions%': 0, |
| 486 'enable_google_now%': 0, | 486 'enable_google_now%': 0, |
| 487 'enable_language_detection%': 1, | 487 'enable_language_detection%': 1, |
| 488 'enable_printing%': 0, | 488 'enable_printing%': 0, |
| 489 'enable_themes%': 0, | 489 'enable_themes%': 0, |
| 490 'proprietary_codecs%': 1, | 490 'proprietary_codecs%': 1, |
| 491 'remoting%': 0, | 491 'remoting%': 0, |
| 492 }], | 492 }], |
| 493 | 493 |
| 494 # Enable autofill dialog for Android and Views-enabled platforms for now
. | 494 # Enable autofill dialog for Android and Views-enabled platforms for now
. |
| 495 ['toolkit_views==1 or (OS=="android" and android_webview_build==0)', { | 495 ['toolkit_views==1 or (OS=="android" and android_webview_build==0) or OS
=="mac"', { |
| 496 'enable_autofill_dialog%': 1 | 496 'enable_autofill_dialog%': 1 |
| 497 }], | 497 }], |
| 498 | 498 |
| 499 ['OS=="android" and android_webview_build==0', { | 499 ['OS=="android" and android_webview_build==0', { |
| 500 'enable_webrtc%': 1, | 500 'enable_webrtc%': 1, |
| 501 }], | 501 }], |
| 502 | 502 |
| 503 # Disable WebRTC for building WebView as part of Android system. | 503 # Disable WebRTC for building WebView as part of Android system. |
| 504 # TODO(boliu): Decide if we want WebRTC, and if so, also merge | 504 # TODO(boliu): Decide if we want WebRTC, and if so, also merge |
| 505 # the necessary third_party repositories. | 505 # the necessary third_party repositories. |
| (...skipping 3734 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4240 # settings in target dicts. SYMROOT is a special case, because many other | 4240 # settings in target dicts. SYMROOT is a special case, because many other |
| 4241 # Xcode variables depend on it, including variables such as | 4241 # Xcode variables depend on it, including variables such as |
| 4242 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 4242 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 4243 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 4243 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 4244 # files to appear (when present) in the UI as actual files and not red | 4244 # files to appear (when present) in the UI as actual files and not red |
| 4245 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 4245 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 4246 # and therefore SYMROOT, needs to be set at the project level. | 4246 # and therefore SYMROOT, needs to be set at the project level. |
| 4247 'SYMROOT': '<(DEPTH)/xcodebuild', | 4247 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 4248 }, | 4248 }, |
| 4249 } | 4249 } |
| OLD | NEW |