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

Side by Side Diff: gyp/iOSShell.gyp

Issue 724813002: Revert of Fix build for iOS after "Make nanobench and dm be usable from Chromium build" (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 1 month 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # 1 #
2 { 2 {
3 'conditions' : [ 3 'conditions' : [
4 [ 'skia_os == "ios"', { 4 [ 'skia_os == "ios"', {
5 'targets': [ 5 'targets': [
6 { 6 {
7 'target_name': 'iOSShell', 7 'target_name': 'iOSShell',
8 'type': 'executable', 8 'type': 'executable',
9 'mac_bundle' : 1, 9 'mac_bundle' : 1,
10 'includes': [ 10 'includes': [
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 '$(SDKROOT)/System/Library/Frameworks/MobileCoreServices.framework ', 60 '$(SDKROOT)/System/Library/Frameworks/MobileCoreServices.framework ',
61 ], 61 ],
62 }, 62 },
63 'include_dirs' : [ 63 'include_dirs' : [
64 '../experimental/iOSSampleApp', 64 '../experimental/iOSSampleApp',
65 '../experimental/iOSSampleApp/iPad', 65 '../experimental/iOSSampleApp/iPad',
66 '../experimental/iOSSampleApp/iPhone', 66 '../experimental/iOSSampleApp/iPhone',
67 '../experimental/iOSSampleApp/Shared', 67 '../experimental/iOSSampleApp/Shared',
68 '../include/utils/ios', 68 '../include/utils/ios',
69 '../src/views/mac', 69 '../src/views/mac',
70 '../bench',
71 ], 70 ],
72 'xcode_settings' : { 71 'xcode_settings' : {
73 'INFOPLIST_FILE' : '../experimental/iOSShell/iOSShell-Info.plist', 72 'INFOPLIST_FILE' : '../experimental/iOSShell/iOSShell-Info.plist',
74 }, 73 },
75 'xcode_config_file': '../experimental/iOSSampleApp/SkiOSSampleApp-Base .xcconfig', 74 'xcode_config_file': '../experimental/iOSSampleApp/SkiOSSampleApp-Base .xcconfig',
76 'mac_bundle_resources' : [ 75 'mac_bundle_resources' : [
77 '../experimental/iOSSampleApp/iPad/MainWindow_iPad.xib', 76 '../experimental/iOSSampleApp/iPad/MainWindow_iPad.xib',
78 '../experimental/iOSSampleApp/iPhone/MainWindow_iPhone.xib', 77 '../experimental/iOSSampleApp/iPhone/MainWindow_iPhone.xib',
79 ], 78 ],
80 'conditions' : [ 79 'conditions' : [
81 [ 'skia_gpu == 1', { 80 [ 'skia_gpu == 1', {
82 'dependencies': [ 81 'dependencies': [
83 'gputest.gyp:skgputest', 82 'gputest.gyp:skgputest',
84 ], 83 ],
85 }], 84 }],
86 ], 85 ],
87 }, 86 },
88 ], 87 ],
89 }], 88 }],
90 ] 89 ]
91 } 90 }
OLDNEW
« 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