zra@google.com
3508d336dd
This change also avoids the need to do another 'gclient runhooks' when switching between Android and Linux builds, and between IA32 and ARM Android builds. gyp does not allow 'libraries' sections inside of configurations. Therefore, since some architecture specific paths, libraries, etc. must be specified on the Android NDK's linker command line, to avoid re-gyping when switching between Android IA32 and ARM, this change moves the architecture specific linker flags to a script, android_link.py. To avoid re-gyping when swtiching between Linux and Android, this change creates new configurations that specify the target OS as well as the the target architecture, e.g. ReleaseLinuxARM or ReleaseAndroidARM instead of ReleaseARM. This change also adds a --toolchain flag to build.py, and removes obsoleted logic for setting up the Android build. R=iposva@google.com Review URL: https://codereview.chromium.org//105223002 git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge/dart@31340 260f80e4-7a28-3924-810f-c04153c831b5
75 lines
2.3 KiB
Python
75 lines
2.3 KiB
Python
# Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
|
# Use of this source code is governed by a BSD-style license that can be
|
|
# found in the LICENSE file.
|
|
|
|
# Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
|
|
# for details. All rights reserved. Use of this source code is governed by a
|
|
# BSD-style license that can be found in the LICENSE file.
|
|
|
|
# This file is a modified copy of src/third_party/zlib/zlib.gyp from Chromium.
|
|
# Revision 232552 (this should agree with "nss_rev" in DEPS).
|
|
{
|
|
# Added by Dart. All Dart comments refer to the following block or line.
|
|
'includes': [
|
|
'../../tools/gyp/runtime-configurations.gypi',
|
|
'../../tools/gyp/nss_configurations.gypi',
|
|
],
|
|
'variables': {
|
|
# Added by Dart.
|
|
'zlib_path': '../../../third_party/zlib',
|
|
},
|
|
# Added by Dart. We do not indent, so diffs with the original are clearer.
|
|
'conditions': [[ 'dart_io_support==1', {
|
|
'targets': [
|
|
{
|
|
'target_name': 'zlib_dart', # Added by Dart (the _dart postfix)
|
|
'type': 'static_library',
|
|
'toolsets':['host','target'],
|
|
# Changed by Dart: '<(zlib_directory)/' added to all paths.
|
|
'sources': [
|
|
'<(zlib_path)/adler32.c',
|
|
'<(zlib_path)/compress.c',
|
|
'<(zlib_path)/crc32.c',
|
|
'<(zlib_path)/crc32.h',
|
|
'<(zlib_path)/deflate.c',
|
|
'<(zlib_path)/deflate.h',
|
|
'<(zlib_path)/gzclose.c',
|
|
'<(zlib_path)/gzguts.h',
|
|
'<(zlib_path)/gzlib.c',
|
|
'<(zlib_path)/gzread.c',
|
|
'<(zlib_path)/gzwrite.c',
|
|
'<(zlib_path)/infback.c',
|
|
'<(zlib_path)/inffast.c',
|
|
'<(zlib_path)/inffast.h',
|
|
'<(zlib_path)/inffixed.h',
|
|
'<(zlib_path)/inflate.c',
|
|
'<(zlib_path)/inflate.h',
|
|
'<(zlib_path)/inftrees.c',
|
|
'<(zlib_path)/inftrees.h',
|
|
'<(zlib_path)/mozzconf.h',
|
|
'<(zlib_path)/trees.c',
|
|
'<(zlib_path)/trees.h',
|
|
'<(zlib_path)/uncompr.c',
|
|
'<(zlib_path)/zconf.h',
|
|
'<(zlib_path)/zlib.h',
|
|
'<(zlib_path)/zutil.c',
|
|
'<(zlib_path)/zutil.h',
|
|
],
|
|
'include_dirs': [
|
|
'<(zlib_path)/.',
|
|
],
|
|
'direct_dependent_settings': {
|
|
'include_dirs': [
|
|
'<(zlib_path)/.',
|
|
],
|
|
},
|
|
'conditions': [
|
|
['OS!="win"', {
|
|
'product_name': 'chrome_zlib',
|
|
}],
|
|
],
|
|
},
|
|
],
|
|
}]],
|
|
}
|