Index: runtime/BUILD.gn |
diff --git a/runtime/BUILD.gn b/runtime/BUILD.gn |
index df10d3a7228afd3bc29a861ee2b6ae8df9f71834..d07dbd6b9782683db28d06ac4b46bb39846b9526 100644 |
--- a/runtime/BUILD.gn |
+++ b/runtime/BUILD.gn |
@@ -89,6 +89,11 @@ config("dart_precompiler_config") { |
defines += ["DART_PRECOMPILER"] |
} |
+config("dart_no_snapshot_config") { |
+ defines = [] |
+ defines += ["DART_NO_SNAPSHOT"] |
+} |
+ |
config("dart_config") { |
defines = [] |
@@ -97,23 +102,39 @@ config("dart_config") { |
} |
if (dart_target_arch != "") { |
- if (dart_target_arch == "arm") { |
+ if ((dart_target_arch == "arm") || |
+ (dart_target_arch == "simarm")) { |
defines += [ "TARGET_ARCH_ARM" ] |
if (target_os == "mac" || target_os == "ios") { |
defines += [ "TARGET_ABI_IOS" ] |
} else { |
defines += [ "TARGET_ABI_EABI" ] |
} |
- } else if (dart_target_arch == "arm64") { |
+ } else if ((dart_target_arch == "armv6") || |
+ (dart_target_arch == "simarmv6")) { |
+ defines += [ "TARGET_ARCH_ARM" ] |
+ defines += [ "TARGET_ARCH_ARM_6" ] |
+ defines += [ "TARGET_ABI_EABI" ] |
+ } else if ((dart_target_arch == "armv5te") || |
+ (dart_target_arch == "simarmv5te")) { |
+ defines += [ "TARGET_ARCH_ARM" ] |
+ defines += [ "TARGET_ARCH_ARM_5TE" ] |
+ defines += [ "TARGET_ABI_EABI" ] |
+ } else if ((dart_target_arch == "arm64") || |
+ (dart_target_arch == "simarm64")) { |
defines += [ "TARGET_ARCH_ARM64" ] |
- } else if (dart_target_arch == "mips") { |
+ } else if ((dart_target_arch == "mips") || |
+ (dart_target_arch == "simmips")) { |
defines += [ "TARGET_ARCH_MIPS" ] |
} else if (dart_target_arch == "x64") { |
defines += [ "TARGET_ARCH_X64" ] |
} else if (dart_target_arch == "ia32") { |
defines += [ "TARGET_ARCH_IA32" ] |
- } else if (dart_target_arch == "dbc") { |
+ } else if ((dart_target_arch == "dbc") || |
+ (dart_target_arch == "simdbc") || |
+ (dart_target_arch == "simdbc64")) { |
defines += [ "TARGET_ARCH_DBC" ] |
+ defines += [ "USING_SIMULATOR" ] |
} else { |
print("Invalid |dart_target_arch|") |
assert(false) |
@@ -161,8 +182,7 @@ config("dart_config") { |
static_library("libdart") { |
Cutch
2016/09/21 23:26:27
"libdart" and "libdart_precompiled_runtime" can be
zra
2016/09/22 06:08:17
Done.
|
configs += [":dart_config", |
- ":dart_product_config", |
- ":dart_precompiled_runtime_config"] |
+ ":dart_product_config"] |
deps = [ |
"vm:libdart_lib", |
"vm:libdart_vm", |
@@ -187,6 +207,34 @@ static_library("libdart") { |
] |
} |
+static_library("libdart_precompiled_runtime") { |
+ configs += [":dart_config", |
+ ":dart_product_config", |
+ ":dart_precompiled_runtime_config"] |
+ deps = [ |
+ "vm:libdart_lib_precompiled_runtime", |
+ "vm:libdart_vm_precompiled_runtime", |
+ "third_party/double-conversion/src:libdouble_conversion", |
+ ":generate_version_cc_file", |
+ ] |
+ include_dirs = [ |
+ ".", |
+ ] |
+ public_configs = [":dart_public_config"] |
+ sources = [ |
+ "include/dart_api.h", |
+ "include/dart_mirrors_api.h", |
+ "include/dart_native_api.h", |
+ "include/dart_tools_api.h", |
+ "vm/dart_api_impl.cc", |
+ "vm/debugger_api_impl.cc", |
+ "vm/mirrors_api_impl.cc", |
+ "vm/native_api_impl.cc", |
+ "vm/version.h", |
+ "$target_gen_dir/version.cc", |
+ ] |
+} |
+ |
action("generate_version_cc_file") { |
deps = [ |
":libdart_dependency_helper", |
@@ -211,8 +259,7 @@ action("generate_version_cc_file") { |
executable("libdart_dependency_helper") { |
configs += [":dart_config", |
- ":dart_product_config", |
- ":dart_precompiled_runtime_config"] |
+ ":dart_product_config"] |
deps = [ |
"vm:libdart_lib_nosnapshot", |
"vm:libdart_lib", |