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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: dart/tools/gyp/configurations.gypi

Issue 119673004: Version 1.1.0-dev.5.2 (Closed) Base URL: http://dart.googlecode.com/svn/trunk/
Patch Set: Created 6 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « dart/tools/dom/scripts/systemnative.py ('k') | dart/tools/gyp/configurations_android.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: dart/tools/gyp/configurations.gypi
===================================================================
--- dart/tools/gyp/configurations.gypi (revision 31530)
+++ dart/tools/gyp/configurations.gypi (working copy)
@@ -13,20 +13,29 @@
# Default value. This may be overridden in a containing project gyp.
'target_arch%': 'ia32',
- 'conditions': [
- ['"<(target_arch)"=="ia32"', { 'dart_target_arch': 'IA32', }],
- ['"<(target_arch)"=="x64"', { 'dart_target_arch': 'X64', }],
- ['"<(target_arch)"=="arm"', { 'dart_target_arch': 'ARM', }],
- ['"<(target_arch)"=="simarm"', { 'dart_target_arch': 'SIMARM', }],
- ['"<(target_arch)"=="mips"', { 'dart_target_arch': 'MIPS', }],
- ['"<(target_arch)"=="simmips"', { 'dart_target_arch': 'SIMMIPS', }],
- ],
+ 'conditions': [
+ ['"<(target_arch)"=="ia32"', { 'dart_target_arch': 'IA32', }],
+ ['"<(target_arch)"=="x64"', { 'dart_target_arch': 'X64', }],
+ ['"<(target_arch)"=="arm"', { 'dart_target_arch': 'ARM', }],
+ ['"<(target_arch)"=="simarm"', { 'dart_target_arch': 'SIMARM', }],
+ ['"<(target_arch)"=="mips"', { 'dart_target_arch': 'MIPS', }],
+ ['"<(target_arch)"=="simmips"', { 'dart_target_arch': 'SIMMIPS', }],
+ [ 'OS=="linux"', { 'dart_target_os': 'Linux', } ],
+ [ 'OS=="mac"', { 'dart_target_os': 'Macos', } ],
+ [ 'OS=="win"', { 'dart_target_os': 'Win', } ],
+ # The OS is set to "android" only when we are building Dartium+Clank. We
+ # use 'chrome_target_os' so that Release and Debug configurations inherit
+ # from Android configurations when OS=="android". If OS is not set to
+ # Android, then Release and Debug inherit from the usual configurations.
+ [ 'OS=="android"', { 'chrome_target_os': 'Android',},
+ { 'chrome_target_os': '',}],
+ ],
},
- 'conditions': [
- [ 'OS=="android"', { 'includes': [ 'configurations_android.gypi', ], } ],
- [ 'OS=="linux"', { 'includes': [ 'configurations_make.gypi', ], } ],
- [ 'OS=="mac"', { 'includes': [ 'configurations_xcode.gypi', ], } ],
- [ 'OS=="win"', { 'includes': [ 'configurations_msvs.gypi', ], } ],
+ 'includes': [
+ 'configurations_android.gypi',
+ 'configurations_make.gypi',
+ 'configurations_xcode.gypi',
+ 'configurations_msvs.gypi',
],
'target_defaults': {
'default_configuration': 'DebugIA32',
@@ -82,68 +91,157 @@
],
},
+
+ # Configurations
'DebugIA32': {
- 'inherit_from': ['Dart_Base', 'Dart_ia32_Base', 'Dart_Debug'],
+ 'inherit_from': [
+ 'Dart_Base', 'Dart_ia32_Base', 'Dart_Debug',
+ 'Dart_<(dart_target_os)_Base',
+ 'Dart_<(dart_target_os)_ia32_Base',
+ 'Dart_<(dart_target_os)_Debug',],
},
'ReleaseIA32': {
- 'inherit_from': ['Dart_Base', 'Dart_ia32_Base', 'Dart_Release'],
+ 'inherit_from': [
+ 'Dart_Base', 'Dart_ia32_Base', 'Dart_Release',
+ 'Dart_<(dart_target_os)_Base',
+ 'Dart_<(dart_target_os)_ia32_Base',
+ 'Dart_<(dart_target_os)_Release',],
},
'DebugX64': {
- 'inherit_from': ['Dart_Base', 'Dart_x64_Base', 'Dart_Debug'],
+ 'inherit_from': [
+ 'Dart_Base', 'Dart_x64_Base', 'Dart_Debug',
+ 'Dart_<(dart_target_os)_Base',
+ 'Dart_<(dart_target_os)_x64_Base',
+ 'Dart_<(dart_target_os)_Debug',],
},
'ReleaseX64': {
- 'inherit_from': ['Dart_Base', 'Dart_x64_Base', 'Dart_Release'],
+ 'inherit_from': [
+ 'Dart_Base', 'Dart_x64_Base', 'Dart_Release',
+ 'Dart_<(dart_target_os)_Base',
+ 'Dart_<(dart_target_os)_x64_Base',
+ 'Dart_<(dart_target_os)_Release',],
},
'DebugSIMARM': {
- 'inherit_from': ['Dart_Base', 'Dart_simarm_Base', 'Dart_Debug'],
+ 'inherit_from': [
+ 'Dart_Base', 'Dart_simarm_Base', 'Dart_Debug',
+ 'Dart_<(dart_target_os)_Base',
+ 'Dart_<(dart_target_os)_simarm_Base',
+ 'Dart_<(dart_target_os)_Debug',],
'defines': [
'DEBUG',
],
},
'ReleaseSIMARM': {
- 'inherit_from': ['Dart_Base', 'Dart_simarm_Base', 'Dart_Release'],
+ 'inherit_from': [
+ 'Dart_Base', 'Dart_simarm_Base', 'Dart_Release',
+ 'Dart_<(dart_target_os)_Base',
+ 'Dart_<(dart_target_os)_simarm_Base',
+ 'Dart_<(dart_target_os)_Release',],
},
- 'DebugARM': {
- 'inherit_from': ['Dart_Base', 'Dart_arm_Base', 'Dart_Debug'],
- },
-
- 'ReleaseARM': {
- 'inherit_from': ['Dart_Base', 'Dart_arm_Base', 'Dart_Release'],
- },
-
'DebugSIMMIPS': {
- 'inherit_from': ['Dart_Base', 'Dart_simmips_Base', 'Dart_Debug'],
+ 'inherit_from': [
+ 'Dart_Base', 'Dart_simmips_Base', 'Dart_Debug',
+ 'Dart_<(dart_target_os)_Base',
+ 'Dart_<(dart_target_os)_simmips_Base',
+ 'Dart_<(dart_target_os)_Debug',],
'defines': [
'DEBUG',
],
},
'ReleaseSIMMIPS': {
- 'inherit_from': ['Dart_Base', 'Dart_simmips_Base', 'Dart_Release'],
+ 'inherit_from': [
+ 'Dart_Base', 'Dart_simmips_Base', 'Dart_Release',
+ 'Dart_<(dart_target_os)_Base',
+ 'Dart_<(dart_target_os)_simmips_Base',
+ 'Dart_<(dart_target_os)_Release',],
},
+
+ # ARM and MIPS hardware configurations are only for Linux and Android.
+ 'DebugARM': {
+ 'inherit_from': [
+ 'Dart_Base', 'Dart_arm_Base', 'Dart_Debug',
+ 'Dart_Linux_Base',
+ 'Dart_Linux_arm_Base',
+ 'Dart_Linux_Debug',],
+ },
+
+ 'ReleaseARM': {
+ 'inherit_from': [
+ 'Dart_Base', 'Dart_arm_Base', 'Dart_Release',
+ 'Dart_Linux_Base',
+ 'Dart_Linux_arm_Base',
+ 'Dart_Linux_Release',],
+ },
+
'DebugMIPS': {
- 'inherit_from': ['Dart_Base', 'Dart_mips_Base', 'Dart_Debug'],
+ 'inherit_from': [
+ 'Dart_Base', 'Dart_mips_Base', 'Dart_Debug',
+ 'Dart_Linux_Base',
+ 'Dart_Linux_mips_Base',
+ 'Dart_Linux_Debug',],
},
'ReleaseMIPS': {
- 'inherit_from': ['Dart_Base', 'Dart_mips_Base', 'Dart_Release'],
+ 'inherit_from': [
+ 'Dart_Base', 'Dart_mips_Base', 'Dart_Release',
+ 'Dart_Linux_Base',
+ 'Dart_Linux_mips_Base',
+ 'Dart_Linux_Release',],
},
+ # Android configurations. The configuration names explicitly include
+ # 'Android' because we are cross-building from Linux, and, when building
+ # the standalone VM, we cannot inspect the gyp built-in 'OS' variable to
+ # figure out that we are building for Android. Since we have not re-run
+ # gyp, it will still be 'linux'.
+ 'DebugAndroidIA32': {
+ 'inherit_from': [
+ 'Dart_Base', 'Dart_ia32_Base', 'Dart_Debug',
+ 'Dart_Android_Base',
+ 'Dart_Android_ia32_Base',
+ 'Dart_Android_Debug',],
+ },
+
+ 'ReleaseAndroidIA32': {
+ 'inherit_from': [
+ 'Dart_Base', 'Dart_ia32_Base', 'Dart_Release',
+ 'Dart_Android_Base',
+ 'Dart_Android_ia32_Base',
+ 'Dart_Android_Release',],
+ },
+
+ 'DebugAndroidARM': {
+ 'inherit_from': [
+ 'Dart_Base', 'Dart_arm_Base', 'Dart_Debug',
+ 'Dart_Android_Base',
+ 'Dart_Android_arm_Base',
+ 'Dart_Android_Debug',],
+ },
+
+ 'ReleaseAndroidARM': {
+ 'inherit_from': [
+ 'Dart_Base', 'Dart_arm_Base', 'Dart_Release',
+ 'Dart_Android_Base',
+ 'Dart_Android_arm_Base',
+ 'Dart_Android_Release',],
+ },
+
# These targets assume that target_arch is passed in explicitly
# by the containing project (e.g., chromium).
'Debug': {
- 'inherit_from': ['Debug<(dart_target_arch)']
+ 'inherit_from': ['Debug<(chrome_target_os)<(dart_target_arch)']
},
'Release': {
- 'inherit_from': ['Release<(dart_target_arch)']
+ 'inherit_from': ['Release<(chrome_target_os)<(dart_target_arch)']
},
},
},
« no previous file with comments | « dart/tools/dom/scripts/systemnative.py ('k') | dart/tools/gyp/configurations_android.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698