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

Unified Diff: Source/core/core.gyp

Issue 1532413002: Added Dartium changes onto 45.0.2454.104 (Closed) Base URL: http://src.chromium.org/blink/branches/chromium/2454
Patch Set: Created 5 years 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 | « Source/build/features.gypi ('k') | Source/core/core.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/core.gyp
diff --git a/Source/core/core.gyp b/Source/core/core.gyp
index 531892782253d25b8915450fbbbc0e2e4b6a6b8e..7b2089106e13e77c19209c47810e214d96e93063 100644
--- a/Source/core/core.gyp
+++ b/Source/core/core.gyp
@@ -43,6 +43,11 @@
'webcore_include_dirs': [
'..', # WebKit/Source
'<(SHARED_INTERMEDIATE_DIR)/blink', # gen/blink
+ # FIXMEDART: We need a better place for this or a way to eliminate it. The
+ # dart_debugger_api.h file assumes this is on the include path to find dart_api.h.
+ '../../../../dart/runtime',
+ # FIXMEDART: We need this to include <dart_api.h>. How is v8 providing <v8.h>?
+ '../../../../dart/runtime/include',
],
'conditions': [
@@ -172,6 +177,7 @@
'inspector_protocol_sources',
'inspector_instrumentation_sources',
'../bindings/core/v8/generated.gyp:bindings_core_v8_generated',
+# '../bindings/core/dart/generated.gyp:dart_snapshot',
# FIXME: don't depend on bindings_modules http://crbug.com/358074
'../bindings/modules/generated.gyp:modules_event_generated',
'../bindings/modules/v8/generated.gyp:bindings_modules_v8_generated',
@@ -196,9 +202,12 @@
],
'sources': [
# FIXME: should be bindings_core_v8_files http://crbug.com/358074
+ '<@(bindings_common_files)',
'<@(bindings_core_v8_files)',
+ '<@(bindings_core_dart_files)',
# These files include all the .cpp files generated from the .idl files
# in webcore_files.
+ '<@(additional_derived_sources_aggregate_files)',
'<@(bindings_core_v8_generated_aggregate_files)',
'<@(bindings_core_v8_generated_union_type_files)',
@@ -240,6 +249,7 @@
'../bindings/core/v8/generated.gyp:bindings_core_v8_generated',
# FIXME: don't depend on bindings_modules http://crbug.com/358074
'../bindings/modules/v8/generated.gyp:bindings_modules_v8_generated',
+# '../bindings/core/dart/generated.gyp:dart_snapshot',
'../wtf/wtf.gyp:wtf',
'../config.gyp:config',
'../platform/blink_platform.gyp:blink_platform',
@@ -258,6 +268,7 @@
'<(DEPTH)/third_party/zlib/zlib.gyp:zlib',
'<(DEPTH)/url/url.gyp:url_lib',
'<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
+ '<@(additional_target_deps)',
],
'export_dependent_settings': [
'../wtf/wtf.gyp:wtf',
@@ -277,6 +288,7 @@
'<(DEPTH)/third_party/zlib/zlib.gyp:zlib',
'<(DEPTH)/url/url.gyp:url_lib',
'<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
+ '<@(additional_target_deps)',
],
'direct_dependent_settings': {
'defines': [
« no previous file with comments | « Source/build/features.gypi ('k') | Source/core/core.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698