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

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: Created 6 years, 4 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 962 matching lines...) Expand 10 before | Expand all | Expand 10 after
973 'enable_wifi_bootstrapping%' : 1, 973 'enable_wifi_bootstrapping%' : 1,
974 }], 974 }],
975 975
976 # Path to sas.dll, which provides the SendSAS function. 976 # Path to sas.dll, which provides the SendSAS function.
977 # http://msdn.microsoft.com/en-us/library/windows/desktop/dd979761(v=vs. 85).aspx 977 # http://msdn.microsoft.com/en-us/library/windows/desktop/dd979761(v=vs. 85).aspx
978 ['target_arch=="x64"', { 978 ['target_arch=="x64"', {
979 'sas_dll_path%': '<(DEPTH)/third_party/platformsdk_win7/files/redist/a md64', 979 'sas_dll_path%': '<(DEPTH)/third_party/platformsdk_win7/files/redist/a md64',
980 }, { 980 }, {
981 'sas_dll_path%': '<(DEPTH)/third_party/platformsdk_win7/files/redist/x 86', 981 'sas_dll_path%': '<(DEPTH)/third_party/platformsdk_win7/files/redist/x 86',
982 }], 982 }],
983
984 # Turn on JNI generation optimizations on non-WebView builds.
985 ['OS=="android" and android_webview_build==0', {
986 'optimize_jni_generation%': 1,
987 }],
cjhopman 2014/08/27 19:08:51 You should set this to 0 in the else case.
mlamouri (slow - plz ping) 2014/08/28 15:12:03 Done.
983 ], 988 ],
984 989
985 # Set this to 1 to enable use of concatenated impulse responses 990 # Set this to 1 to enable use of concatenated impulse responses
986 # for the HRTF panner in WebAudio. 991 # for the HRTF panner in WebAudio.
987 'use_concatenated_impulse_responses': 1, 992 'use_concatenated_impulse_responses': 1,
988 993
989 # You can set the variable 'use_official_google_api_keys' to 1 994 # You can set the variable 'use_official_google_api_keys' to 1
990 # to use the Google-internal file containing official API keys 995 # to use the Google-internal file containing official API keys
991 # for Google Chrome even in a developer build. Setting this 996 # for Google Chrome even in a developer build. Setting this
992 # variable explicitly to 1 will cause your build to fail if the 997 # variable explicitly to 1 will cause your build to fail if the
(...skipping 741 matching lines...) Expand 10 before | Expand all | Expand 10 after
1734 # Location of the "strip" binary, used by both gyp and scripts. 1739 # Location of the "strip" binary, used by both gyp and scripts.
1735 'android_strip%' : '<!(/bin/echo -n <(android_toolchain)/*-strip)', 1740 'android_strip%' : '<!(/bin/echo -n <(android_toolchain)/*-strip)',
1736 1741
1737 # Location of the "readelf" binary. 1742 # Location of the "readelf" binary.
1738 'android_readelf%' : '<!(/bin/echo -n <(android_toolchain)/*-readelf)', 1743 'android_readelf%' : '<!(/bin/echo -n <(android_toolchain)/*-readelf)',
1739 1744
1740 # Determines whether we should optimize JNI generation at the cost of 1745 # Determines whether we should optimize JNI generation at the cost of
1741 # breaking assumptions in the build system that when inputs have changed 1746 # breaking assumptions in the build system that when inputs have changed
1742 # the outputs should always change as well. This is meant purely for 1747 # the outputs should always change as well. This is meant purely for
1743 # developer builds, to avoid spurious re-linking of native files. 1748 # developer builds, to avoid spurious re-linking of native files.
1744 'optimize_jni_generation%': 0, 1749 'optimize_jni_generation%': '<(optimize_jni_generation)',
1745 1750
1746 # Always uses openssl. 1751 # Always uses openssl.
1747 'use_openssl%': 1, 1752 'use_openssl%': 1,
1748 'use_openssl_certs%': 1, 1753 'use_openssl_certs%': 1,
1749 1754
1750 'proprietary_codecs%': '<(proprietary_codecs)', 1755 'proprietary_codecs%': '<(proprietary_codecs)',
1751 'safe_browsing%': 1, 1756 'safe_browsing%': 1,
1752 'enable_web_speech%': 0, 1757 'enable_web_speech%': 0,
1753 'java_bridge%': 1, 1758 'java_bridge%': 1,
1754 'build_ffmpegsumo%': 0, 1759 'build_ffmpegsumo%': 0,
(...skipping 3949 matching lines...) Expand 10 before | Expand all | Expand 10 after
5704 # settings in target dicts. SYMROOT is a special case, because many other 5709 # settings in target dicts. SYMROOT is a special case, because many other
5705 # Xcode variables depend on it, including variables such as 5710 # Xcode variables depend on it, including variables such as
5706 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5711 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5707 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5712 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5708 # files to appear (when present) in the UI as actual files and not red 5713 # files to appear (when present) in the UI as actual files and not red
5709 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5714 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5710 # and therefore SYMROOT, needs to be set at the project level. 5715 # and therefore SYMROOT, needs to be set at the project level.
5711 'SYMROOT': '<(DEPTH)/xcodebuild', 5716 'SYMROOT': '<(DEPTH)/xcodebuild',
5712 }, 5717 },
5713 } 5718 }
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