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

Side by Side Diff: media/media.gyp

Issue 23903032: Move NV21 colorspace treatment from VideoCapture java to C++ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Try again uploading - didn't work :( Created 7 years, 3 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 unified diff | Download patch
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 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 # Override to dynamically link the cras (ChromeOS audio) library. 8 # Override to dynamically link the cras (ChromeOS audio) library.
9 'use_cras%': 0, 9 'use_cras%': 0,
10 # Option e.g. for Linux distributions to link pulseaudio directly 10 # Option e.g. for Linux distributions to link pulseaudio directly
(...skipping 1419 matching lines...) Expand 10 before | Expand all | Expand 10 after
1430 ], 1430 ],
1431 'include_dirs': [ 1431 'include_dirs': [
1432 '<(SHARED_INTERMEDIATE_DIR)/media', 1432 '<(SHARED_INTERMEDIATE_DIR)/media',
1433 ], 1433 ],
1434 }, 1434 },
1435 { 1435 {
1436 'target_name': 'media_java', 1436 'target_name': 'media_java',
1437 'type': 'none', 1437 'type': 'none',
1438 'dependencies': [ 1438 'dependencies': [
1439 '../base/base.gyp:base', 1439 '../base/base.gyp:base',
1440 'media_android_imageformat_list',
1440 ], 1441 ],
1441 'export_dependent_settings': [ 1442 'export_dependent_settings': [
1442 '../base/base.gyp:base', 1443 '../base/base.gyp:base',
1443 ], 1444 ],
1444 'variables': { 1445 'variables': {
1445 'java_in_dir': 'base/android/java', 1446 'java_in_dir': 'base/android/java',
1446 }, 1447 },
1447 'includes': ['../build/java.gypi'], 1448 'includes': ['../build/java.gypi'],
1448 }, 1449 },
1449 1450 {
1451 'target_name': 'media_android_imageformat_list',
1452 'type': 'none',
1453 'sources': [
1454 'base/android/java/src/org/chromium/media/ImageFormat.template',
1455 ],
1456 'variables': {
1457 'package_name': 'org/chromium/media',
1458 'template_deps': ['video/capture/android/imageformat_list.h'],
1459 },
1460 'includes': [ '../build/android/java_cpp_template.gypi' ],
1461 },
1450 ], 1462 ],
1451 }], 1463 }],
1452 ['media_use_ffmpeg==1', { 1464 ['media_use_ffmpeg==1', {
1453 'targets': [ 1465 'targets': [
1454 { 1466 {
1455 'target_name': 'ffmpeg_unittests', 1467 'target_name': 'ffmpeg_unittests',
1456 'type': 'executable', 1468 'type': 'executable',
1457 'dependencies': [ 1469 'dependencies': [
1458 '../base/base.gyp:base', 1470 '../base/base.gyp:base',
1459 '../base/base.gyp:base_i18n', 1471 '../base/base.gyp:base_i18n',
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
1512 ], 1524 ],
1513 }], 1525 }],
1514 ], 1526 ],
1515 }], 1527 }],
1516 ], 1528 ],
1517 }, 1529 },
1518 ], 1530 ],
1519 }], 1531 }],
1520 ], 1532 ],
1521 } 1533 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698