| OLD | NEW |
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 { | 4 { |
| 5 'variables': { | 5 'variables': { |
| 6 'libvpx_build_vp9%': 1, | 6 'libvpx_build_vp9%': 1, |
| 7 'libvpx_source%': 'source/libvpx', | 7 'libvpx_source%': 'source/libvpx', |
| 8 'conditions': [ | 8 'conditions': [ |
| 9 ['os_posix==1', { | 9 ['os_posix==1', { |
| 10 'asm_obj_extension': 'o', | 10 'asm_obj_extension': 'o', |
| (...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 174 '-Wno-conversion', | 174 '-Wno-conversion', |
| 175 # libvpx does `if ((a == b))` in some places. | 175 # libvpx does `if ((a == b))` in some places. |
| 176 '-Wno-parentheses-equality', | 176 '-Wno-parentheses-equality', |
| 177 ], | 177 ], |
| 178 }, | 178 }, |
| 179 'cflags': [ | 179 'cflags': [ |
| 180 '-Wno-conversion', | 180 '-Wno-conversion', |
| 181 '-Wno-parentheses-equality', | 181 '-Wno-parentheses-equality', |
| 182 ], | 182 ], |
| 183 }], | 183 }], |
| 184 ['chromeos == 1', { | |
| 185 # ChromeOS needs these files for animated WebM avatars. | |
| 186 'sources': [ | |
| 187 '<(libvpx_source)/third_party/libmkv/EbmlIDs.h', | |
| 188 '<(libvpx_source)/third_party/libmkv/EbmlWriter.c', | |
| 189 '<(libvpx_source)/third_party/libmkv/EbmlWriter.h', | |
| 190 ], | |
| 191 }], | |
| 192 ], | 184 ], |
| 193 }, | 185 }, |
| 194 ], | 186 ], |
| 195 }, | 187 }, |
| 196 ], | 188 ], |
| 197 # 'libvpx' target for mips builds. | 189 # 'libvpx' target for mips builds. |
| 198 [ 'target_arch=="mipsel" ', { | 190 [ 'target_arch=="mipsel" ', { |
| 199 'targets': [ | 191 'targets': [ |
| 200 { | 192 { |
| 201 # This libvpx target contains both encoder and decoder. | 193 # This libvpx target contains both encoder and decoder. |
| (...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 345 ['arm_neon==1', { | 337 ['arm_neon==1', { |
| 346 'includes': [ | 338 'includes': [ |
| 347 'libvpx_srcs_arm_neon.gypi', | 339 'libvpx_srcs_arm_neon.gypi', |
| 348 ], | 340 ], |
| 349 }], | 341 }], |
| 350 ['OS == "android"', { | 342 ['OS == "android"', { |
| 351 'includes': [ | 343 'includes': [ |
| 352 '../../build/android/cpufeatures.gypi', | 344 '../../build/android/cpufeatures.gypi', |
| 353 ], | 345 ], |
| 354 }], | 346 }], |
| 355 ['chromeos == 1', { | |
| 356 # ChromeOS needs these files for animated WebM avatars. | |
| 357 'sources': [ | |
| 358 '<(libvpx_source)/third_party/libmkv/EbmlIDs.h', | |
| 359 '<(libvpx_source)/third_party/libmkv/EbmlWriter.c', | |
| 360 '<(libvpx_source)/third_party/libmkv/EbmlWriter.h', | |
| 361 ], | |
| 362 }], | |
| 363 ['OS == "ios"', { | 347 ['OS == "ios"', { |
| 364 'xcode_settings': { | 348 'xcode_settings': { |
| 365 'OTHER_CFLAGS!': [ | 349 'OTHER_CFLAGS!': [ |
| 366 # Breaks at least boolhuff_armv5te:token_high_bit_not_set_ev. | 350 # Breaks at least boolhuff_armv5te:token_high_bit_not_set_ev. |
| 367 '-fstack-protector-all', # Implies -fstack-protector | 351 '-fstack-protector-all', # Implies -fstack-protector |
| 368 ], | 352 ], |
| 369 }, | 353 }, |
| 370 }], | 354 }], |
| 371 ], | 355 ], |
| 372 }, | 356 }, |
| (...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 593 # Need this otherwise gyp won't run the rule on them. | 577 # Need this otherwise gyp won't run the rule on them. |
| 594 'sources': [ | 578 'sources': [ |
| 595 '<(INTERMEDIATE_DIR)/vpx_scale_asm_offsets.o', | 579 '<(INTERMEDIATE_DIR)/vpx_scale_asm_offsets.o', |
| 596 ], | 580 ], |
| 597 }], | 581 }], |
| 598 ], | 582 ], |
| 599 'includes': ['obj_int_extract.gypi'], | 583 'includes': ['obj_int_extract.gypi'], |
| 600 }, | 584 }, |
| 601 ], | 585 ], |
| 602 } | 586 } |
| OLD | NEW |