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

Side by Side Diff: build/common.gypi

Issue 200753002: [Android] Workaround of an android platform bug. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix a build error. Created 6 years, 9 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 3753 matching lines...) Expand 10 before | Expand all | Expand 10 after
3764 # by remoting. Remoting is off, so it needn't built, 3764 # by remoting. Remoting is off, so it needn't built,
3765 # so forking it's deps seems like overkill. 3765 # so forking it's deps seems like overkill.
3766 # But this variable need defined to properly run gyp. 3766 # But this variable need defined to properly run gyp.
3767 # A proper solution is to have an OS==android conditional 3767 # A proper solution is to have an OS==android conditional
3768 # in third_party/libvpx/libvpx.gyp to define it. 3768 # in third_party/libvpx/libvpx.gyp to define it.
3769 'libvpx_path': 'lib/linux/arm', 3769 'libvpx_path': 'lib/linux/arm',
3770 }, 3770 },
3771 'target_defaults': { 3771 'target_defaults': {
3772 'variables': { 3772 'variables': {
3773 'release_extra_cflags%': '', 3773 'release_extra_cflags%': '',
3774 'lib_version':
3775 '<!(python <(DEPTH)/build/util/version.py -f <(DEPTH)/chrome/VERSI ON -t "@BUILD@.@PATCH@")',
3774 'conditions': [ 3776 'conditions': [
3775 # If we're using the components build, append "cr" to all shared 3777 # If we're using the components build, append "cr" to all shared
3776 # libraries to avoid naming collisions with android system library 3778 # libraries to avoid naming collisions with android system library
3777 # versions with the same name (e.g. skia, icu). 3779 # versions with the same name (e.g. skia, icu).
3778 ['component=="shared_library"', { 3780 ['component=="shared_library"', {
3779 'android_product_extension': 'cr.so', 3781 'android_product_extension': 'cr.so',
3780 }, { 3782 }, {
3781 'android_product_extension': 'so', 3783 'android_product_extension': '<(lib_version).so',
cjhopman 2014/03/17 18:32:35 This is going to apply to all shared libraries. We
Feng Qian 2014/03/18 00:07:01 Strictly speaking, it applies to all libraries onl
3782 } ], 3784 } ],
3783 ], 3785 ],
3784 }, 3786 },
3785 'target_conditions': [ 3787 'target_conditions': [
3786 ['_type=="shared_library"', { 3788 ['_type=="shared_library"', {
3787 'product_extension': '<(android_product_extension)', 3789 'product_extension': '<(android_product_extension)',
3788 }], 3790 }],
3789 3791
3790 # Settings for building device targets using Android's toolchain. 3792 # Settings for building device targets using Android's toolchain.
3791 # These are based on the setup.mk file from the Android NDK. 3793 # These are based on the setup.mk file from the Android NDK.
(...skipping 1260 matching lines...) Expand 10 before | Expand all | Expand 10 after
5052 # settings in target dicts. SYMROOT is a special case, because many other 5054 # settings in target dicts. SYMROOT is a special case, because many other
5053 # Xcode variables depend on it, including variables such as 5055 # Xcode variables depend on it, including variables such as
5054 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5056 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5055 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5057 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5056 # files to appear (when present) in the UI as actual files and not red 5058 # files to appear (when present) in the UI as actual files and not red
5057 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5059 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5058 # and therefore SYMROOT, needs to be set at the project level. 5060 # and therefore SYMROOT, needs to be set at the project level.
5059 'SYMROOT': '<(DEPTH)/xcodebuild', 5061 'SYMROOT': '<(DEPTH)/xcodebuild',
5060 }, 5062 },
5061 } 5063 }
OLDNEW
« no previous file with comments | « build/android/gyp/delete_files.py ('k') | build/java_apk.gypi » ('j') | build/java_apk.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698