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

Unified Diff: media/media.gyp

Issue 1127343003: Revert of media: Add MediaOzonePlatform support (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/DEPS ('k') | media/ozone/media_ozone_platform.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/media.gyp
diff --git a/media/media.gyp b/media/media.gyp
index 5658fff51729fca7c21833ef43f33adac3f83ce9..bbded6ff951b2a075585169d9a523d1d4c6dcd65 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -461,8 +461,6 @@
'midi/usb_midi_jack.h',
'midi/usb_midi_output_stream.cc',
'midi/usb_midi_output_stream.h',
- 'ozone/media_ozone_platform.cc',
- 'ozone/media_ozone_platform.h',
'video/capture/android/video_capture_device_android.cc',
'video/capture/android/video_capture_device_android.h',
'video/capture/android/video_capture_device_factory_android.cc',
@@ -717,49 +715,6 @@
],
}],
],
- }],
- ['use_ozone==1', {
- 'variables': {
- 'platform_list_txt_file': '<(SHARED_INTERMEDIATE_DIR)/ui/ozone/platform_list.txt',
- 'constructor_list_cc_file': '<(INTERMEDIATE_DIR)/media/ozone/constructor_list.cc',
- },
- 'include_dirs': [
- # Used for the generated listing header (ui/ozone/platform_list.h)
- '<(SHARED_INTERMEDIATE_DIR)',
- ],
- 'sources': [
- '<(constructor_list_cc_file)',
- ],
- 'dependencies': [
- '../ui/ozone/ozone.gyp:ozone',
- ],
- 'actions': [
- {
- # Ozone platform objects are auto-generated using similar
- # patterns for naming and classes constructors. Here we build the
- # object MediaOzonePlatform.
- 'action_name': 'generate_constructor_list',
- 'variables': {
- 'generator_path': '../ui/ozone/generate_constructor_list.py',
- },
- 'inputs': [
- '<(generator_path)',
- '<(platform_list_txt_file)',
- ],
- 'outputs': [
- '<(constructor_list_cc_file)',
- ],
- 'action': [
- 'python',
- '<(generator_path)',
- '--platform_list=<(platform_list_txt_file)',
- '--output_cc=<(constructor_list_cc_file)',
- '--namespace=media',
- '--typename=MediaOzonePlatform',
- '--include="media/ozone/media_ozone_platform.h"'
- ],
- },
- ]
}],
['OS!="linux"', {
'sources!': [
« no previous file with comments | « media/DEPS ('k') | media/ozone/media_ozone_platform.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698