Index: tools/gyp/configurations.gypi |
diff --git a/tools/gyp/configurations.gypi b/tools/gyp/configurations.gypi |
index ddf46471f46e3189c6014e10c84a7d9cfbffaa9f..84237ca07feb871df5098b3b80454c9dde5a6a19 100644 |
--- a/tools/gyp/configurations.gypi |
+++ b/tools/gyp/configurations.gypi |
@@ -143,6 +143,13 @@ |
], |
}, |
+ 'Dart_Product' : { |
+ 'abstract': 1, |
+ 'defines' : [ |
+ 'NDEBUG', |
+ 'PRODUCT', |
+ ] |
+ }, |
# Configurations |
'DebugIA32': { |
@@ -163,6 +170,15 @@ |
], |
}, |
+ 'ProductIA32': { |
+ 'inherit_from': [ |
+ 'Dart_Base', 'Dart_ia32_Base', 'Dart_Product', |
+ 'Dart_<(dart_target_os)_Base', |
+ 'Dart_<(dart_target_os)_ia32_Base', |
+ 'Dart_<(dart_target_os)_Product', |
+ ], |
+ }, |
+ |
'DebugX64': { |
'inherit_from': [ |
'Dart_Base', 'Dart_x64_Base', 'Dart_Debug', |
@@ -181,6 +197,15 @@ |
], |
}, |
+ 'ProductX64': { |
+ 'inherit_from': [ |
+ 'Dart_Base', 'Dart_x64_Base', 'Dart_Product', |
+ 'Dart_<(dart_target_os)_Base', |
+ 'Dart_<(dart_target_os)_x64_Base', |
+ 'Dart_<(dart_target_os)_Product', |
+ ], |
+ }, |
+ |
'DebugSIMARM': { |
'inherit_from': [ |
'Dart_Base', 'Dart_simarm_Base', 'Dart_Debug', |
@@ -202,6 +227,15 @@ |
], |
}, |
+ 'ProductSIMARM': { |
+ 'inherit_from': [ |
+ 'Dart_Base', 'Dart_simarm_Base', 'Dart_Product', |
+ 'Dart_<(dart_target_os)_Base', |
+ 'Dart_<(dart_target_os)_simarm_Base', |
+ 'Dart_<(dart_target_os)_Product', |
+ ], |
+ }, |
+ |
'DebugSIMARMV6': { |
'inherit_from': [ |
'Dart_Base', 'Dart_simarmv6_Base', 'Dart_Debug', |
@@ -223,6 +257,15 @@ |
], |
}, |
+ 'ProductSIMARMV6': { |
+ 'inherit_from': [ |
+ 'Dart_Base', 'Dart_simarmv6_Base', 'Dart_Product', |
+ 'Dart_<(dart_target_os)_Base', |
+ 'Dart_<(dart_target_os)_simarmv6_Base', |
+ 'Dart_<(dart_target_os)_Product', |
+ ], |
+ }, |
+ |
'DebugSIMARMV5TE': { |
'inherit_from': [ |
'Dart_Base', 'Dart_simarmv5te_Base', 'Dart_Debug', |
@@ -244,6 +287,15 @@ |
], |
}, |
+ 'ProductSIMARMV5TE': { |
+ 'inherit_from': [ |
+ 'Dart_Base', 'Dart_simarmv5te_Base', 'Dart_Product', |
+ 'Dart_<(dart_target_os)_Base', |
+ 'Dart_<(dart_target_os)_simarmv5te_Base', |
+ 'Dart_<(dart_target_os)_Product', |
+ ], |
+ }, |
+ |
'DebugSIMARM64': { |
'inherit_from': [ |
'Dart_Base', 'Dart_simarm64_Base', 'Dart_Debug', |
@@ -265,6 +317,15 @@ |
], |
}, |
+ 'ProductSIMARM64': { |
+ 'inherit_from': [ |
+ 'Dart_Base', 'Dart_simarm64_Base', 'Dart_Product', |
+ 'Dart_<(dart_target_os)_Base', |
+ 'Dart_<(dart_target_os)_simarm64_Base', |
+ 'Dart_<(dart_target_os)_Product', |
+ ], |
+ }, |
+ |
'DebugSIMMIPS': { |
'inherit_from': [ |
'Dart_Base', 'Dart_simmips_Base', 'Dart_Debug', |
@@ -286,6 +347,15 @@ |
], |
}, |
+ 'ProductSIMMIPS': { |
+ 'inherit_from': [ |
+ 'Dart_Base', 'Dart_simmips_Base', 'Dart_Product', |
+ 'Dart_<(dart_target_os)_Base', |
+ 'Dart_<(dart_target_os)_simmips_Base', |
+ 'Dart_<(dart_target_os)_Product', |
+ ], |
+ }, |
+ |
# ARM and MIPS hardware configurations are only for Linux and Android. |
'DebugXARM': { |
@@ -306,6 +376,15 @@ |
], |
}, |
+ 'ProductXARM': { |
+ 'inherit_from': [ |
+ 'Dart_Base', 'Dart_arm_Base', 'Dart_Product', |
+ 'Dart_Linux_Base', |
+ 'Dart_Linux_xarm_Base', |
+ 'Dart_Linux_Product', |
+ ], |
+ }, |
+ |
'DebugARM': { |
'inherit_from': [ |
'Dart_Base', 'Dart_arm_Base', 'Dart_Debug', |
@@ -324,6 +403,15 @@ |
], |
}, |
+ 'ProductARM': { |
+ 'inherit_from': [ |
+ 'Dart_Base', 'Dart_arm_Base', 'Dart_Product', |
+ 'Dart_Linux_Base', |
+ 'Dart_Linux_arm_Base', |
+ 'Dart_Linux_Product', |
+ ], |
+ }, |
+ |
'DebugXARMV6': { |
'inherit_from': [ |
'Dart_Base', 'Dart_armv6_Base', 'Dart_Debug', |
@@ -342,6 +430,15 @@ |
], |
}, |
+ 'ProductXARMV6': { |
+ 'inherit_from': [ |
+ 'Dart_Base', 'Dart_armv6_Base', 'Dart_Product', |
+ 'Dart_Linux_Base', |
+ 'Dart_Linux_xarmv6_Base', |
+ 'Dart_Linux_Product', |
+ ], |
+ }, |
+ |
'DebugARMV6': { |
'inherit_from': [ |
'Dart_Base', 'Dart_armv6_Base', 'Dart_Debug', |
@@ -360,6 +457,15 @@ |
], |
}, |
+ 'ProductARMV6': { |
+ 'inherit_from': [ |
+ 'Dart_Base', 'Dart_armv6_Base', 'Dart_Product', |
+ 'Dart_Linux_Base', |
+ 'Dart_Linux_armv6_Base', |
+ 'Dart_Linux_Product', |
+ ], |
+ }, |
+ |
'DebugXARMV5TE': { |
'inherit_from': [ |
'Dart_Base', 'Dart_armv5te_Base', 'Dart_Debug', |
@@ -378,6 +484,15 @@ |
], |
}, |
+ 'ProductXARMV5TE': { |
+ 'inherit_from': [ |
+ 'Dart_Base', 'Dart_armv5te_Base', 'Dart_Product', |
+ 'Dart_Linux_Base', |
+ 'Dart_Linux_xarmv5te_Base', |
+ 'Dart_Linux_Product', |
+ ], |
+ }, |
+ |
'DebugARMV5TE': { |
'inherit_from': [ |
'Dart_Base', 'Dart_armv5te_Base', 'Dart_Debug', |
@@ -396,6 +511,15 @@ |
], |
}, |
+ 'ProductARMV5TE': { |
+ 'inherit_from': [ |
+ 'Dart_Base', 'Dart_armv5te_Base', 'Dart_Product', |
+ 'Dart_Linux_Base', |
+ 'Dart_Linux_armv5te_Base', |
+ 'Dart_Linux_Product', |
+ ], |
+ }, |
+ |
'DebugXARM64': { |
'inherit_from': [ |
'Dart_Base', 'Dart_arm64_Base', 'Dart_Debug', |
@@ -414,6 +538,15 @@ |
], |
}, |
+ 'ProductXARM64': { |
+ 'inherit_from': [ |
+ 'Dart_Base', 'Dart_arm64_Base', 'Dart_Product', |
+ 'Dart_Linux_Base', |
+ 'Dart_Linux_xarm64_Base', |
+ 'Dart_Linux_Product', |
+ ], |
+ }, |
+ |
'DebugARM64': { |
'inherit_from': [ |
'Dart_Base', 'Dart_arm64_Base', 'Dart_Debug', |
@@ -432,6 +565,15 @@ |
], |
}, |
+ 'ProductARM64': { |
+ 'inherit_from': [ |
+ 'Dart_Base', 'Dart_arm64_Base', 'Dart_Product', |
+ 'Dart_Linux_Base', |
+ 'Dart_Linux_arm64_Base', |
+ 'Dart_Linux_Product', |
+ ], |
+ }, |
+ |
'DebugXMIPS': { |
'inherit_from': [ |
'Dart_Base', 'Dart_mips_Base', 'Dart_Debug', |
@@ -450,6 +592,15 @@ |
], |
}, |
+ 'ProductXMIPS': { |
+ 'inherit_from': [ |
+ 'Dart_Base', 'Dart_mips_Base', 'Dart_Product', |
+ 'Dart_Linux_Base', |
+ 'Dart_Linux_xmips_Base', |
+ 'Dart_Linux_Product', |
+ ], |
+ }, |
+ |
'DebugMIPS': { |
'inherit_from': [ |
'Dart_Base', 'Dart_mips_Base', 'Dart_Debug', |
@@ -468,6 +619,15 @@ |
], |
}, |
+ 'ProductMIPS': { |
+ 'inherit_from': [ |
+ 'Dart_Base', 'Dart_mips_Base', 'Dart_Product', |
+ 'Dart_Linux_Base', |
+ 'Dart_Linux_mips_Base', |
+ 'Dart_Linux_Product', |
+ ], |
+ }, |
+ |
# 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 |
@@ -491,6 +651,15 @@ |
], |
}, |
+ 'ProductAndroidIA32': { |
+ 'inherit_from': [ |
+ 'Dart_Base', 'Dart_ia32_Base', 'Dart_Product', |
+ 'Dart_Android_Base', |
+ 'Dart_Android_ia32_Base', |
+ 'Dart_Android_Product', |
+ ], |
+ }, |
+ |
'DebugAndroidARM': { |
'inherit_from': [ |
'Dart_Base', 'Dart_arm_Base', 'Dart_Debug', |
@@ -509,6 +678,15 @@ |
], |
}, |
+ 'ProductAndroidARM': { |
+ 'inherit_from': [ |
+ 'Dart_Base', 'Dart_arm_Base', 'Dart_Product', |
+ 'Dart_Android_Base', |
+ 'Dart_Android_arm_Base', |
+ 'Dart_Android_Product', |
+ ], |
+ }, |
+ |
'DebugAndroidARM64': { |
'inherit_from': [ |
'Dart_Base', 'Dart_arm64_Base', 'Dart_Debug', |
@@ -527,6 +705,15 @@ |
], |
}, |
+ 'ProductAndroidARM64': { |
+ 'inherit_from': [ |
+ 'Dart_Base', 'Dart_arm64_Base', 'Dart_Product', |
+ 'Dart_Android_Base', |
+ 'Dart_Android_arm64_Base', |
+ 'Dart_Android_Product', |
+ ], |
+ }, |
+ |
# These targets assume that target_arch is passed in explicitly |
# by the containing project (e.g., chromium). |
'Debug': { |