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

Unified Diff: pdfium.gyp

Issue 1413593003: Merge to XFA: Consolidate test support code. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@xfa
Patch Set: Remove stray merges. Created 5 years, 2 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 | « BUILD.gn ('k') | samples/BUILD.gn » ('j') | samples/BUILD.gn » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pdfium.gyp
diff --git a/pdfium.gyp b/pdfium.gyp
index 4d20f82f181eb57eafa81f98b1249e7f628777b4..471e970cb3de6d2278070d8b76e0981cf4fd784f 100644
--- a/pdfium.gyp
+++ b/pdfium.gyp
@@ -763,6 +763,7 @@
'<(DEPTH)/testing/gtest.gyp:gtest_main',
'<(DEPTH)/testing/gtest.gyp:gtest',
'pdfium',
+ 'test_support',
],
'include_dirs': [
'<(DEPTH)'
@@ -793,6 +794,7 @@
'<(DEPTH)/testing/gmock.gyp:gmock',
'<(DEPTH)/testing/gtest.gyp:gtest',
'pdfium',
+ 'test_support',
],
'include_dirs': [
'<(DEPTH)',
@@ -811,8 +813,6 @@
'testing/embedder_test.h',
'testing/embedder_test_mock_delegate.h',
'testing/embedder_test_timer_handling_delegate.h',
- 'testing/fx_string_testhelpers.cpp',
- 'testing/fx_string_testhelpers.h',
],
'conditions': [
['pdf_enable_v8==1', {
@@ -830,5 +830,34 @@
}],
],
},
+ {
+ 'target_name': 'test_support',
+ 'type': 'static_library',
+ 'dependencies': [
+ '<(DEPTH)/testing/gmock.gyp:gmock',
+ '<(DEPTH)/testing/gtest.gyp:gtest',
+ ],
+ 'include_dirs': [
+ '<(DEPTH)',
+ ],
+ 'sources': [
+ 'testing/fx_string_testhelpers.cpp',
+ 'testing/fx_string_testhelpers.h',
+ 'testing/test_support.cpp',
+ 'testing/test_support.h',
+ ],
+ 'conditions': [
+ ['pdf_enable_v8==1', {
+ 'include_dirs': [
+ '<(DEPTH)/v8',
+ '<(DEPTH)/v8/include',
+ ],
+ 'dependencies': [
+ '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
+ '<(DEPTH)/v8/tools/gyp/v8.gyp:v8_libplatform',
+ ],
+ }],
+ ],
+ },
],
}
« no previous file with comments | « BUILD.gn ('k') | samples/BUILD.gn » ('j') | samples/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698