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

Side by Side Diff: build/common.gypi

Issue 502743002: Always enable optimize_jni_generation on non-WebView builds. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: review comments Created 6 years, 3 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 | « build/android/developer_recommended_flags.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 (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 982 matching lines...) Expand 10 before | Expand all | Expand 10 after
993 'enable_wifi_bootstrapping%' : 1, 993 'enable_wifi_bootstrapping%' : 1,
994 }], 994 }],
995 995
996 # Path to sas.dll, which provides the SendSAS function. 996 # Path to sas.dll, which provides the SendSAS function.
997 # http://msdn.microsoft.com/en-us/library/windows/desktop/dd979761(v=vs. 85).aspx 997 # http://msdn.microsoft.com/en-us/library/windows/desktop/dd979761(v=vs. 85).aspx
998 ['target_arch=="x64"', { 998 ['target_arch=="x64"', {
999 'sas_dll_path%': '<(DEPTH)/third_party/platformsdk_win7/files/redist/a md64', 999 'sas_dll_path%': '<(DEPTH)/third_party/platformsdk_win7/files/redist/a md64',
1000 }, { 1000 }, {
1001 'sas_dll_path%': '<(DEPTH)/third_party/platformsdk_win7/files/redist/x 86', 1001 'sas_dll_path%': '<(DEPTH)/third_party/platformsdk_win7/files/redist/x 86',
1002 }], 1002 }],
1003
1004 # Turn on JNI generation optimizations on non-WebView builds.
1005 ['OS=="android" and android_webview_build==0', {
1006 'optimize_jni_generation%': 1,
1007 }, {
1008 'optimize_jni_generation%': 0,
1009 }],
1003 ], 1010 ],
1004 1011
1005 # Set this to 1 to enable use of concatenated impulse responses 1012 # Set this to 1 to enable use of concatenated impulse responses
1006 # for the HRTF panner in WebAudio. 1013 # for the HRTF panner in WebAudio.
1007 'use_concatenated_impulse_responses': 1, 1014 'use_concatenated_impulse_responses': 1,
1008 1015
1009 # You can set the variable 'use_official_google_api_keys' to 1 1016 # You can set the variable 'use_official_google_api_keys' to 1
1010 # to use the Google-internal file containing official API keys 1017 # to use the Google-internal file containing official API keys
1011 # for Google Chrome even in a developer build. Setting this 1018 # for Google Chrome even in a developer build. Setting this
1012 # variable explicitly to 1 will cause your build to fail if the 1019 # variable explicitly to 1 will cause your build to fail if the
(...skipping 747 matching lines...) Expand 10 before | Expand all | Expand 10 after
1760 # Location of the "strip" binary, used by both gyp and scripts. 1767 # Location of the "strip" binary, used by both gyp and scripts.
1761 'android_strip%' : '<!(/bin/echo -n <(android_toolchain)/*-strip)', 1768 'android_strip%' : '<!(/bin/echo -n <(android_toolchain)/*-strip)',
1762 1769
1763 # Location of the "readelf" binary. 1770 # Location of the "readelf" binary.
1764 'android_readelf%' : '<!(/bin/echo -n <(android_toolchain)/*-readelf)', 1771 'android_readelf%' : '<!(/bin/echo -n <(android_toolchain)/*-readelf)',
1765 1772
1766 # Determines whether we should optimize JNI generation at the cost of 1773 # Determines whether we should optimize JNI generation at the cost of
1767 # breaking assumptions in the build system that when inputs have changed 1774 # breaking assumptions in the build system that when inputs have changed
1768 # the outputs should always change as well. This is meant purely for 1775 # the outputs should always change as well. This is meant purely for
1769 # developer builds, to avoid spurious re-linking of native files. 1776 # developer builds, to avoid spurious re-linking of native files.
1770 'optimize_jni_generation%': 0, 1777 'optimize_jni_generation%': '<(optimize_jni_generation)',
1771 1778
1772 # Always uses openssl. 1779 # Always uses openssl.
1773 'use_openssl%': 1, 1780 'use_openssl%': 1,
1774 'use_openssl_certs%': 1, 1781 'use_openssl_certs%': 1,
1775 1782
1776 'proprietary_codecs%': '<(proprietary_codecs)', 1783 'proprietary_codecs%': '<(proprietary_codecs)',
1777 'safe_browsing%': 1, 1784 'safe_browsing%': 1,
1778 'enable_web_speech%': 0, 1785 'enable_web_speech%': 0,
1779 'java_bridge%': 1, 1786 'java_bridge%': 1,
1780 'build_ffmpegsumo%': 0, 1787 'build_ffmpegsumo%': 0,
(...skipping 3977 matching lines...) Expand 10 before | Expand all | Expand 10 after
5758 # settings in target dicts. SYMROOT is a special case, because many other 5765 # settings in target dicts. SYMROOT is a special case, because many other
5759 # Xcode variables depend on it, including variables such as 5766 # Xcode variables depend on it, including variables such as
5760 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5767 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5761 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5768 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5762 # files to appear (when present) in the UI as actual files and not red 5769 # files to appear (when present) in the UI as actual files and not red
5763 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5770 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5764 # and therefore SYMROOT, needs to be set at the project level. 5771 # and therefore SYMROOT, needs to be set at the project level.
5765 'SYMROOT': '<(DEPTH)/xcodebuild', 5772 'SYMROOT': '<(DEPTH)/xcodebuild',
5766 }, 5773 },
5767 } 5774 }
OLDNEW
« no previous file with comments | « build/android/developer_recommended_flags.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698