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

Side by Side Diff: build/common.gypi

Issue 556863004: Turn off jarjar in android_webview_telemetry_build (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Unremove important line. 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 | « no previous file | 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 1798 matching lines...) Expand 10 before | Expand all | Expand 10 after
1809 'ozone_platform_ozonex%': 1, 1809 'ozone_platform_ozonex%': 1,
1810 'conditions': [ 1810 'conditions': [
1811 ['target_arch=="arm"', { 1811 ['target_arch=="arm"', {
1812 'arm_arch%': '', 1812 'arm_arch%': '',
1813 'arm_tune%': 'cortex-a9', 1813 'arm_tune%': 'cortex-a9',
1814 'arm_thumb%': 1, 1814 'arm_thumb%': 1,
1815 'video_hole%': 1, 1815 'video_hole%': 1,
1816 }], 1816 }],
1817 ], 1817 ],
1818 }], 1818 }],
1819 ['android_webview_build==1 or android_webview_telemetry_build==1', { 1819 ['android_webview_build==1', {
1820 # When building the WebView in the Android tree, jarjar will remap all 1820 # When building the WebView in the Android tree, jarjar will remap all
1821 # the class names, so the JNI generator needs to know this. 1821 # the class names, so the JNI generator needs to know this.
1822 'jni_generator_jarjar_file': '../android_webview/build/jarjar-rules.txt' , 1822 'jni_generator_jarjar_file': '../android_webview/build/jarjar-rules.txt' ,
1823 }], 1823 }],
1824 ['OS=="linux" and target_arch!="mipsel"', { 1824 ['OS=="linux" and target_arch!="mipsel"', {
1825 # TODO(thakis): This is here to measure perf for a while. 1825 # TODO(thakis): This is here to measure perf for a while.
1826 'clang%': 1, 1826 'clang%': 1,
1827 }], # OS=="mac" 1827 }], # OS=="mac"
1828 ['OS=="mac"', { 1828 ['OS=="mac"', {
1829 'conditions': [ 1829 'conditions': [
(...skipping 3924 matching lines...) Expand 10 before | Expand all | Expand 10 after
5754 # settings in target dicts. SYMROOT is a special case, because many other 5754 # settings in target dicts. SYMROOT is a special case, because many other
5755 # Xcode variables depend on it, including variables such as 5755 # Xcode variables depend on it, including variables such as
5756 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5756 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5757 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5757 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5758 # files to appear (when present) in the UI as actual files and not red 5758 # files to appear (when present) in the UI as actual files and not red
5759 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5759 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5760 # and therefore SYMROOT, needs to be set at the project level. 5760 # and therefore SYMROOT, needs to be set at the project level.
5761 'SYMROOT': '<(DEPTH)/xcodebuild', 5761 'SYMROOT': '<(DEPTH)/xcodebuild',
5762 }, 5762 },
5763 } 5763 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698