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

Side by Side Diff: build/common.gypi

Issue 11026038: Android: fix webview-in-android build config. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 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 | Annotate | Revision Log
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 2756 matching lines...) Expand 10 before | Expand all | Expand 10 after
2767 # to say that it does. Define them here instead. 2767 # to say that it does. Define them here instead.
2768 'HAVE_SYS_UIO_H', 2768 'HAVE_SYS_UIO_H',
2769 ], 2769 ],
2770 'cflags': [ 2770 'cflags': [
2771 '--sysroot=<(android_ndk_sysroot)', 2771 '--sysroot=<(android_ndk_sysroot)',
2772 ], 2772 ],
2773 'ldflags': [ 2773 'ldflags': [
2774 '--sysroot=<(android_ndk_sysroot)', 2774 '--sysroot=<(android_ndk_sysroot)',
2775 ], 2775 ],
2776 }], 2776 }],
2777 ['android_build_type==1', {
2778 'include_dirs': [
2779 # OpenAL headers from the Android tree.
2780 '<(android_src)/frameworks/wilhelm/include',
2781 ],
2782 'cflags': [
2783 # Chromium builds its own (non-third-party) code with
2784 # -Werror to make all warnings into errors. However, Android
2785 # enables warnings that Chromium doesn't, so some of these
2786 # extra warnings trip and break things.
2787 # For now, we leave these warnings enabled but prevent them
2788 # from being treated as errors.
2789 #
2790 # Things that are part of -Wextra:
2791 '-Wno-error=extra', # Enabled by -Wextra, but no specific flag
2792 '-Wno-error=ignored-qualifiers',
2793 '-Wno-error=type-limits',
2794 # Other things unrelated to -Wextra:
2795 '-Wno-error=non-virtual-dtor',
2796 '-Wno-error=sign-promo',
2797 ],
2798 'cflags_cc': [
2799 # Disabling c++0x-compat should be handled in WebKit, but
2800 # this currently doesn't work because gcc_version is not set
2801 # correctly when building with the Android build system.
2802 # TODO(torne): Fix this in WebKit.
2803 '-Wno-error=c++0x-compat',
2804 ],
2805 }],
2806 ['android_build_type==1 and chromium_code==0', {
2807 'cflags': [
2808 # There is a class of warning which:
2809 # 1) Android always enables and also treats as errors
2810 # 2) Chromium ignores in third party code
2811 # For now, I am leaving these warnings enabled but preventing
2812 # them from being treated as errors here.
2813 '-Wno-error=address',
2814 '-Wno-error=format-security',
2815 '-Wno-error=non-virtual-dtor',
2816 '-Wno-error=return-type',
2817 '-Wno-error=sequence-point',
Nico 2012/12/07 20:41:41 I happened to see this while reading common.gypi f
2818 ],
2819 }],
2777 ['target_arch == "arm"', { 2820 ['target_arch == "arm"', {
2778 'ldflags': [ 2821 'ldflags': [
2779 # Enable identical code folding to reduce size. 2822 # Enable identical code folding to reduce size.
2780 '-Wl,--icf=safe', 2823 '-Wl,--icf=safe',
2781 ], 2824 ],
2782 }], 2825 }],
2783 # NOTE: The stlport header include paths below are specified in 2826 # NOTE: The stlport header include paths below are specified in
2784 # cflags rather than include_dirs because they need to come 2827 # cflags rather than include_dirs because they need to come
2785 # after include_dirs. Think of them like system headers, but 2828 # after include_dirs. Think of them like system headers, but
2786 # don't use '-isystem' because the arm-linux-androideabi-4.4.3 2829 # don't use '-isystem' because the arm-linux-androideabi-4.4.3
(...skipping 729 matching lines...) Expand 10 before | Expand all | Expand 10 after
3516 # settings in target dicts. SYMROOT is a special case, because many other 3559 # settings in target dicts. SYMROOT is a special case, because many other
3517 # Xcode variables depend on it, including variables such as 3560 # Xcode variables depend on it, including variables such as
3518 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 3561 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
3519 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 3562 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
3520 # files to appear (when present) in the UI as actual files and not red 3563 # files to appear (when present) in the UI as actual files and not red
3521 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 3564 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
3522 # and therefore SYMROOT, needs to be set at the project level. 3565 # and therefore SYMROOT, needs to be set at the project level.
3523 'SYMROOT': '<(DEPTH)/xcodebuild', 3566 'SYMROOT': '<(DEPTH)/xcodebuild',
3524 }, 3567 },
3525 } 3568 }
OLDNEW
« build/android/envsetup.sh ('K') | « build/android/envsetup_functions.sh ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698