Left: | ||
Right: |
OLD | NEW |
---|---|
1 { | 1 { |
2 'conditions': [[ | 2 'conditions': [[ |
3 # We don't want to use curl on Windows and Android, skip the check there | 3 # We don't want to use curl on Windows and Android, skip the check there |
4 'OS=="win" or OS=="android"', | 4 'OS=="win" or OS=="android"', |
5 { | 5 { |
6 'variables': { | 6 'variables': { |
7 'have_curl': 0 | 7 'have_curl': 0 |
8 } | 8 } |
9 }, | 9 }, |
10 { | 10 { |
(...skipping 27 matching lines...) Expand all Loading... | |
38 'src/Utils.cpp', | 38 'src/Utils.cpp', |
39 'src/WebRequestJsObject.cpp', | 39 'src/WebRequestJsObject.cpp', |
40 '<(INTERMEDIATE_DIR)/adblockplus.js.cpp' | 40 '<(INTERMEDIATE_DIR)/adblockplus.js.cpp' |
41 ], | 41 ], |
42 'direct_dependent_settings': { | 42 'direct_dependent_settings': { |
43 'include_dirs': ['include'] | 43 'include_dirs': ['include'] |
44 }, | 44 }, |
45 'conditions': [ | 45 'conditions': [ |
46 ['OS=="android"', { | 46 ['OS=="android"', { |
47 'link_settings': { | 47 'link_settings': { |
48 'ldflags': [ | |
Andrey Novikov
2013/06/18 11:48:28
This is not the part of callback staff but is a us
Wladimir Palant
2013/06/18 15:02:15
It should be android_arm.release however.
| |
49 '-Landroid_arm.debug/obj.target/tools/gyp' | |
50 ], | |
48 'libraries': [ | 51 'libraries': [ |
49 'android_arm.release/obj.target/tools/gyp/libv8_base.a', | 52 '-lv8_base', |
Felix Dahlke
2013/06/19 10:28:38
I'm surprised this works, it's not really common t
| |
50 'android_arm.release/obj.target/tools/gyp/libv8_snapshot.a', | 53 '-lv8_nosnapshot', |
51 ], | 54 ], |
52 } | 55 }, |
56 'standalone_static_library': 1, # disable thin archives | |
53 }, { | 57 }, { |
54 'dependencies': ['third_party/v8/tools/gyp/v8.gyp:v8'], | 58 'dependencies': ['third_party/v8/tools/gyp/v8.gyp:v8'], |
55 'export_dependent_settings': ['third_party/v8/tools/gyp/v8.gyp:v8'], | 59 'export_dependent_settings': ['third_party/v8/tools/gyp/v8.gyp:v8'], |
56 }], | 60 }], |
57 ['have_curl==1', | 61 ['have_curl==1', |
58 { | 62 { |
59 'sources': [ | 63 'sources': [ |
60 'src/DefaultWebRequestCurl.cpp', | 64 'src/DefaultWebRequestCurl.cpp', |
61 ], | 65 ], |
62 'link_settings': { | 66 'link_settings': { |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
97 'lib/updater.js', | 101 'lib/updater.js', |
98 'adblockplus/lib/filterNotifier.js', | 102 'adblockplus/lib/filterNotifier.js', |
99 'lib/init.js', | 103 'lib/init.js', |
100 'adblockplus/lib/filterClasses.js', | 104 'adblockplus/lib/filterClasses.js', |
101 'adblockplus/lib/subscriptionClasses.js', | 105 'adblockplus/lib/subscriptionClasses.js', |
102 'adblockplus/lib/filterStorage.js', | 106 'adblockplus/lib/filterStorage.js', |
103 'adblockplus/lib/elemHide.js', | 107 'adblockplus/lib/elemHide.js', |
104 'adblockplus/lib/matcher.js', | 108 'adblockplus/lib/matcher.js', |
105 'adblockplus/lib/filterListener.js', | 109 'adblockplus/lib/filterListener.js', |
106 'adblockplus/lib/synchronizer.js', | 110 'adblockplus/lib/synchronizer.js', |
111 'lib/filterUpdateRegistration.js', | |
107 'adblockplus/chrome/content/ui/subscriptions.xml', | 112 'adblockplus/chrome/content/ui/subscriptions.xml', |
108 ], | 113 ], |
109 'load_before_files': [ | 114 'load_before_files': [ |
110 'lib/compat.js' | 115 'lib/compat.js' |
111 ], | 116 ], |
112 'load_after_files': [ | 117 'load_after_files': [ |
113 'lib/api.js', | 118 'lib/api.js', |
114 'lib/publicSuffixList.js', | 119 'lib/publicSuffixList.js', |
115 'lib/punycode.js', | 120 'lib/punycode.js', |
116 'lib/basedomain.js', | 121 'lib/basedomain.js', |
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
157 'test/WebRequest.cpp' | 162 'test/WebRequest.cpp' |
158 ], | 163 ], |
159 'msvs_settings': { | 164 'msvs_settings': { |
160 'VCLinkerTool': { | 165 'VCLinkerTool': { |
161 'SubSystem': '1', # Console | 166 'SubSystem': '1', # Console |
162 'EntryPointSymbol': 'mainCRTStartup', | 167 'EntryPointSymbol': 'mainCRTStartup', |
163 }, | 168 }, |
164 }, | 169 }, |
165 }] | 170 }] |
166 } | 171 } |
OLD | NEW |