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

Side by Side Diff: build/common.gypi

Issue 10271039: This patch is to enable x86 android build. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: fix comment lines issue Created 8 years, 7 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
« no previous file with comments | « build/android/envsetup.sh ('k') | skia/skia.gyp » ('j') | 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 790 matching lines...) Expand 10 before | Expand all | Expand 10 after
801 ['(branding=="Chrome" and buildtype=="Official")', { 801 ['(branding=="Chrome" and buildtype=="Official")', {
802 'linux_dump_symbols%': 1, 802 'linux_dump_symbols%': 1,
803 }], 803 }],
804 ], 804 ],
805 }], # os_posix==1 and OS!="mac" and OS!="android" 805 }], # os_posix==1 and OS!="mac" and OS!="android"
806 ['OS=="android"', { 806 ['OS=="android"', {
807 # Location of Android NDK. 807 # Location of Android NDK.
808 'variables': { 808 'variables': {
809 'variables': { 809 'variables': {
810 'android_ndk_root%': '<!(/bin/echo -n $ANDROID_NDK_ROOT)', 810 'android_ndk_root%': '<!(/bin/echo -n $ANDROID_NDK_ROOT)',
811 'target_arch%': 'arm', # target_arch in android terms. 811 # Android uses x86 instead of ia32 for their target_arch
812 # designation.
813 # TODO(wistoch): Adjust the target_arch naming scheme to avoid
814 # confusion.
815 # http://crbug.com/125329
816 'conditions': [
817 ['target_arch == "ia32"', {
818 'target_arch': 'x86',
819 }],
820 ],
812 821
813 # Switch between different build types, currently only '0' is 822 # Switch between different build types, currently only '0' is
814 # supported. 823 # supported.
815 'android_build_type%': 0, 824 'android_build_type%': 0,
816 }, 825 },
817 'android_ndk_root%': '<(android_ndk_root)', 826 'android_ndk_root%': '<(android_ndk_root)',
818 'android_ndk_sysroot': '<(android_ndk_root)/platforms/android-9/arch-< (target_arch)', 827 'android_ndk_sysroot': '<(android_ndk_root)/platforms/android-9/arch-< (target_arch)',
819 'android_build_type%': '<(android_build_type)', 828 'android_build_type%': '<(android_build_type)',
820 }, 829 },
821 'android_ndk_root%': '<(android_ndk_root)', 830 'android_ndk_root%': '<(android_ndk_root)',
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
956 'secure_atl%': 1, 965 'secure_atl%': 1,
957 }], 966 }],
958 ], 967 ],
959 'nacl_win64_defines': [ 968 'nacl_win64_defines': [
960 # This flag is used to minimize dependencies when building 969 # This flag is used to minimize dependencies when building
961 # Native Client loader for 64-bit Windows. 970 # Native Client loader for 64-bit Windows.
962 'NACL_WIN64', 971 'NACL_WIN64',
963 ], 972 ],
964 }], 973 }],
965 974
966 ['os_posix==1 and chromeos==0 and target_arch!="arm"', { 975 ['os_posix==1 and chromeos==0 and OS!="android"', {
967 'use_cups%': 1, 976 'use_cups%': 1,
968 }, { 977 }, {
969 'use_cups%': 0, 978 'use_cups%': 0,
970 }], 979 }],
971 980
972 # Set the relative path from this file to the GYP file of the JPEG 981 # Set the relative path from this file to the GYP file of the JPEG
973 # library used by Chromium. 982 # library used by Chromium.
974 ['use_libjpeg_turbo==1', { 983 ['use_libjpeg_turbo==1', {
975 'libjpeg_gyp_path': '../third_party/libjpeg_turbo/libjpeg.gyp', 984 'libjpeg_gyp_path': '../third_party/libjpeg_turbo/libjpeg.gyp',
976 }, { 985 }, {
(...skipping 1382 matching lines...) Expand 10 before | Expand all | Expand 10 after
2359 'HAVE_OFF64_T', 2368 'HAVE_OFF64_T',
2360 'HAVE_SYS_UIO_H', 2369 'HAVE_SYS_UIO_H',
2361 'ANDROID_BINSIZE_HACK', # Enable temporary hacks to reduce binsize . 2370 'ANDROID_BINSIZE_HACK', # Enable temporary hacks to reduce binsize .
2362 ], 2371 ],
2363 'ldflags!': [ 2372 'ldflags!': [
2364 '-pthread', # Not supported by Android toolchain. 2373 '-pthread', # Not supported by Android toolchain.
2365 ], 2374 ],
2366 'ldflags': [ 2375 'ldflags': [
2367 '-nostdlib', 2376 '-nostdlib',
2368 '-Wl,--no-undefined', 2377 '-Wl,--no-undefined',
2369 '-Wl,--icf=safe', # Enable identical code folding to reduce size
2370 # Don't export symbols from statically linked libraries. 2378 # Don't export symbols from statically linked libraries.
2371 '-Wl,--exclude-libs=ALL', 2379 '-Wl,--exclude-libs=ALL',
2372 ], 2380 ],
2381 'conditions': [
Nico 2012/05/03 05:02:16 This…
2382 ['target_arch == "arm"', {
2383 'ldflags': [
2384 # Enable identical code folding to reduce size.
2385 '-Wl,--icf=safe',
2386 ],
2387 }],
2388 ],
2373 'libraries': [ 2389 'libraries': [
2374 '-l<(android_stlport_library)', 2390 '-l<(android_stlport_library)',
2375 # Manually link the libgcc.a that the cross compiler uses. 2391 # Manually link the libgcc.a that the cross compiler uses.
2376 '<!(${ANDROID_TOOLCHAIN}/*-gcc -print-libgcc-file-name)', 2392 '<!(${ANDROID_TOOLCHAIN}/*-gcc -print-libgcc-file-name)',
2377 '-lc', 2393 '-lc',
2378 '-ldl', 2394 '-ldl',
2379 '-lstdc++', 2395 '-lstdc++',
2380 '-lm', 2396 '-lm',
2381 ], 2397 ],
2382 'conditions': [ 2398 'conditions': [
Nico 2012/05/03 05:02:16 …overrides the condition block here, which is a gy
Wei James(wistoch) 2012/05/03 05:18:33 done. thanks
2383 ['android_build_type==0', { 2399 ['android_build_type==0', {
2384 'ldflags': [ 2400 'ldflags': [
2385 '--sysroot=<(android_ndk_sysroot)', 2401 '--sysroot=<(android_ndk_sysroot)',
2386 ], 2402 ],
2387 }], 2403 }],
2388 # NOTE: The stlport header include paths below are specified in 2404 # NOTE: The stlport header include paths below are specified in
2389 # cflags rather than include_dirs because they need to come 2405 # cflags rather than include_dirs because they need to come
2390 # after include_dirs. Think of them like system headers, but 2406 # after include_dirs. Think of them like system headers, but
2391 # don't use '-isystem' because the arm-linux-androideabi-4.4.3 2407 # don't use '-isystem' because the arm-linux-androideabi-4.4.3
2392 # toolchain (circa Gingerbread) will exhibit strange errors. 2408 # toolchain (circa Gingerbread) will exhibit strange errors.
(...skipping 640 matching lines...) Expand 10 before | Expand all | Expand 10 after
3033 # settings in target dicts. SYMROOT is a special case, because many other 3049 # settings in target dicts. SYMROOT is a special case, because many other
3034 # Xcode variables depend on it, including variables such as 3050 # Xcode variables depend on it, including variables such as
3035 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 3051 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
3036 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 3052 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
3037 # files to appear (when present) in the UI as actual files and not red 3053 # files to appear (when present) in the UI as actual files and not red
3038 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 3054 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
3039 # and therefore SYMROOT, needs to be set at the project level. 3055 # and therefore SYMROOT, needs to be set at the project level.
3040 'SYMROOT': '<(DEPTH)/xcodebuild', 3056 'SYMROOT': '<(DEPTH)/xcodebuild',
3041 }, 3057 },
3042 } 3058 }
OLDNEW
« no previous file with comments | « build/android/envsetup.sh ('k') | skia/skia.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698