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

Unified Diff: build/all.gyp

Issue 14034019: Have aura_builder build Chrome Frame and its tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/all.gyp
diff --git a/build/all.gyp b/build/all.gyp
index eccae46040eff2f09aced02842956ac89484a709..f2f685301277eea312527da3f86495aefaafd52b 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -775,6 +775,24 @@
['OS=="win"', {
'dependencies': [
'../chrome/chrome.gyp:crash_service',
+ '../chrome_frame/chrome_frame.gyp:npchrome_frame',
+ ],
+ }],
+ ['OS=="win" and target_arch!="x64"', {
grt (UTC plus 2) 2013/04/24 21:36:51 this awkwardness follows in the footsteps of line
+ 'dependencies': [
+ '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests',
+ '../chrome_frame/chrome_frame.gyp:chrome_frame_perftests',
+ '../chrome_frame/chrome_frame.gyp:chrome_frame_reliability_tests',
+ '../chrome_frame/chrome_frame.gyp:chrome_frame_tests',
+ '../chrome_frame/chrome_frame.gyp:chrome_frame_unittests',
+ ],
+ }],
+ ['OS=="win" and target_arch=="x64"', {
+ 'dependencies!': [
+ '../chrome_frame/chrome_frame.gyp:npchrome_frame',
+ ],
+ 'defines': [
+ 'OMIT_CHROME_FRAME',
],
}],
['OS=="win" and target_arch=="ia32"', {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698