| 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 925 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 936 | 936 |
| 937 # Use the system icu. | 937 # Use the system icu. |
| 938 'use_system_icu%': 0, | 938 'use_system_icu%': 0, |
| 939 | 939 |
| 940 # TODO(yfriedman): Remove once unit_tests can link for Android. | 940 # TODO(yfriedman): Remove once unit_tests can link for Android. |
| 941 # To override it specify: | 941 # To override it specify: |
| 942 # GYP_DEFINES="$GYP_DEFINES android_unit_test_target_type=executable" | 942 # GYP_DEFINES="$GYP_DEFINES android_unit_test_target_type=executable" |
| 943 # android_gyp | 943 # android_gyp |
| 944 'android_unit_test_target_type%': 'static_library', | 944 'android_unit_test_target_type%': 'static_library', |
| 945 | 945 |
| 946 # Choose static link by build type. | |
| 947 'conditions': [ | 946 'conditions': [ |
| 947 # Choose static link by build type. |
| 948 ['android_build_type==0', { | 948 ['android_build_type==0', { |
| 949 'static_link_system_icu%': 1, | 949 'static_link_system_icu%': 1, |
| 950 }, { | 950 }, { |
| 951 'static_link_system_icu%': 0, | 951 'static_link_system_icu%': 0, |
| 952 }], | 952 }], |
| 953 ], | 953 ], |
| 954 # TODO(steveblock): Investigate using the system versions of sqlite, | 954 # TODO(steveblock): Investigate using the system versions of sqlite, |
| 955 # libjpeg, expat and stlport. | 955 # libjpeg, expat and stlport. |
| 956 # Enable to use system sqlite. | 956 # Enable to use system sqlite. |
| 957 'use_system_sqlite%': 0, # '<(android_build_type)', | 957 'use_system_sqlite%': 0, # '<(android_build_type)', |
| (...skipping 918 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1876 }], | 1876 }], |
| 1877 ['OS=="linux"', { | 1877 ['OS=="linux"', { |
| 1878 'target_conditions': [ | 1878 'target_conditions': [ |
| 1879 ['_toolset=="target"', { | 1879 ['_toolset=="target"', { |
| 1880 'cflags': [ | 1880 'cflags': [ |
| 1881 '<@(release_extra_cflags)', | 1881 '<@(release_extra_cflags)', |
| 1882 ], | 1882 ], |
| 1883 }], | 1883 }], |
| 1884 ], | 1884 ], |
| 1885 }], | 1885 }], |
| 1886 # Android enables DCHECK()s on non-Official release builds. |
| 1887 ['OS=="android" and buildtype!="Official"', { |
| 1888 'defines!': ['NDEBUG'], |
| 1889 }], |
| 1886 ], | 1890 ], |
| 1887 }, | 1891 }, |
| 1888 # | 1892 # |
| 1889 # Concrete configurations | 1893 # Concrete configurations |
| 1890 # | 1894 # |
| 1891 'Debug': { | 1895 'Debug': { |
| 1892 'inherit_from': ['Common_Base', 'x86_Base', 'Debug_Base'], | 1896 'inherit_from': ['Common_Base', 'x86_Base', 'Debug_Base'], |
| 1893 }, | 1897 }, |
| 1894 'Release': { | 1898 'Release': { |
| 1895 'inherit_from': ['Common_Base', 'x86_Base', 'Release_Base'], | 1899 'inherit_from': ['Common_Base', 'x86_Base', 'Release_Base'], |
| (...skipping 1347 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3243 # settings in target dicts. SYMROOT is a special case, because many other | 3247 # settings in target dicts. SYMROOT is a special case, because many other |
| 3244 # Xcode variables depend on it, including variables such as | 3248 # Xcode variables depend on it, including variables such as |
| 3245 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 3249 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 3246 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 3250 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 3247 # files to appear (when present) in the UI as actual files and not red | 3251 # files to appear (when present) in the UI as actual files and not red |
| 3248 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 3252 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 3249 # and therefore SYMROOT, needs to be set at the project level. | 3253 # and therefore SYMROOT, needs to be set at the project level. |
| 3250 'SYMROOT': '<(DEPTH)/xcodebuild', | 3254 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 3251 }, | 3255 }, |
| 3252 } | 3256 } |
| OLD | NEW |