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

Side by Side Diff: libvpx.gyp

Issue 11413061: Fix Android build. (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/libvpx/
Patch Set: code review, use CHROMIUM_BUILD flag Created 8 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | source/libvpx/vpx_ports/arm_cpudetect.c » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 'use_system_libvpx%': 0, 6 'use_system_libvpx%': 0,
7 }, 7 },
8 'conditions': [ 8 'conditions': [
9 ['use_system_libvpx==0', { 9 ['use_system_libvpx==0', {
10 'variables': { 10 'variables': {
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
242 }], 242 }],
243 # Libvpx optimizations for ARMv7 with NEON. 243 # Libvpx optimizations for ARMv7 with NEON.
244 ['arm_neon==1', { 244 ['arm_neon==1', {
245 'includes': [ 245 'includes': [
246 'libvpx_srcs_arm_neon.gypi', 246 'libvpx_srcs_arm_neon.gypi',
247 ], 247 ],
248 }], 248 }],
249 ['OS == "android"', { 249 ['OS == "android"', {
250 'include_dirs': [ 250 'include_dirs': [
251 '<(android_ndk_include)', 251 '<(android_ndk_include)',
252 '<(android_ndk_include)/machine',
253 ], 252 ],
254 'defines': [ 253 'defines': [
255 'ANDROID_CPU_ARM_FEATURE_NEON=4', 254 'ANDROID_CPU_ARM_FEATURE_NEON=4',
256 ], 255 ],
257 }], 256 }],
258 [ 'chromeos == 1', { 257 [ 'chromeos == 1', {
259 # ChromeOS needs these files for animated WebM avatars. 258 # ChromeOS needs these files for animated WebM avatars.
260 'sources': [ 259 'sources': [
261 'source/libvpx/libmkv/EbmlIDs.h', 260 'source/libvpx/libmkv/EbmlIDs.h',
262 'source/libvpx/libmkv/EbmlWriter.c', 261 'source/libvpx/libmkv/EbmlWriter.c',
(...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after
536 ], 535 ],
537 }], 536 }],
538 ], 537 ],
539 } 538 }
540 539
541 # Local Variables: 540 # Local Variables:
542 # tab-width:2 541 # tab-width:2
543 # indent-tabs-mode:nil 542 # indent-tabs-mode:nil
544 # End: 543 # End:
545 # vim: set expandtab tabstop=2 shiftwidth=2: 544 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « no previous file | source/libvpx/vpx_ports/arm_cpudetect.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698