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

Side by Side Diff: build/common.gypi

Issue 10035034: Implement the skeleton of an android content shell. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed drawable png as it was checked in separately. Created 8 years, 8 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 2423 matching lines...) Expand 10 before | Expand all | Expand 10 after
2434 ], 2434 ],
2435 'libraries': [ 2435 'libraries': [
2436 # crtend_android.o needs to be the last item in libraries. 2436 # crtend_android.o needs to be the last item in libraries.
2437 # Do not add any libraries after this! 2437 # Do not add any libraries after this!
2438 '<(android_ndk_lib)/crtend_android.o', 2438 '<(android_ndk_lib)/crtend_android.o',
2439 ], 2439 ],
2440 }], 2440 }],
2441 ['_type=="shared_library"', { 2441 ['_type=="shared_library"', {
2442 'ldflags': [ 2442 'ldflags': [
2443 '-Wl,-shared,-Bsymbolic', 2443 '-Wl,-shared,-Bsymbolic',
2444 # crtbegin_so.o should be the last item in ldflags.
2445 '<(android_ndk_lib)/crtbegin_so.o',
2444 ], 2446 ],
2445 # Use of -nostdlib prevents the compiler from bringing 2447 'libraries': [
2446 # in crtbegin_dynamic.o et al, so we get an undefined 2448 # crtend_so.o needs to be the last item in libraries.
2447 # reference to ___dso_handle when building 2449 # Do not add any libraries after this!
2448 # gtest_target_type==shared_library. 2450 '<(android_ndk_lib)/crtend_so.o',
2449 'ldflags!': [ '-nostdlib' ], 2451 ],
2450 }], 2452 }],
2451 ], 2453 ],
2452 }], 2454 }],
2453 # Settings for building host targets using the system toolchain. 2455 # Settings for building host targets using the system toolchain.
2454 ['_toolset=="host"', { 2456 ['_toolset=="host"', {
2455 'cflags!': [ 2457 'cflags!': [
2456 # Due to issues in Clang build system, using ASan on 32-bit 2458 # Due to issues in Clang build system, using ASan on 32-bit
2457 # binaries on x86_64 host is problematic. 2459 # binaries on x86_64 host is problematic.
2458 # TODO(eugenis): re-enable. 2460 # TODO(eugenis): re-enable.
2459 '-faddress-sanitizer', 2461 '-faddress-sanitizer',
(...skipping 570 matching lines...) Expand 10 before | Expand all | Expand 10 after
3030 # settings in target dicts. SYMROOT is a special case, because many other 3032 # settings in target dicts. SYMROOT is a special case, because many other
3031 # Xcode variables depend on it, including variables such as 3033 # Xcode variables depend on it, including variables such as
3032 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 3034 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
3033 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 3035 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
3034 # files to appear (when present) in the UI as actual files and not red 3036 # files to appear (when present) in the UI as actual files and not red
3035 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 3037 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
3036 # and therefore SYMROOT, needs to be set at the project level. 3038 # and therefore SYMROOT, needs to be set at the project level.
3037 'SYMROOT': '<(DEPTH)/xcodebuild', 3039 'SYMROOT': '<(DEPTH)/xcodebuild',
3038 }, 3040 },
3039 } 3041 }
OLDNEW
« base/android/jni_registrar.h ('K') | « base/base.gypi ('k') | build/java.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698