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

Side by Side Diff: media/media_cdm.gypi

Issue 949233003: Fix official build in GN (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@random
Patch Set: remove ppapi dep Created 5 years, 10 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
« no previous file with comments | « media/cdm/ppapi/cdm_adapter.gni ('k') | media/media_cdm_adapter.gyp » ('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 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 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 'conditions': [ 7 'conditions': [
8 ['OS == "android"', { 8 ['OS == "android"', {
9 # Android doesn't use ffmpeg. 9 # Android doesn't use ffmpeg.
10 'use_ffmpeg%': 0, 10 'use_ffmpeg%': 0,
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 'cdm/ppapi/external_clear_key/cdm_video_decoder.cc', 91 'cdm/ppapi/external_clear_key/cdm_video_decoder.cc',
92 'cdm/ppapi/external_clear_key/cdm_video_decoder.h', 92 'cdm/ppapi/external_clear_key/cdm_video_decoder.h',
93 'cdm/ppapi/external_clear_key/clear_key_cdm.cc', 93 'cdm/ppapi/external_clear_key/clear_key_cdm.cc',
94 'cdm/ppapi/external_clear_key/clear_key_cdm.h', 94 'cdm/ppapi/external_clear_key/clear_key_cdm.h',
95 'cdm/ppapi/external_clear_key/clear_key_cdm_common.h', 95 'cdm/ppapi/external_clear_key/clear_key_cdm_common.h',
96 ], 96 ],
97 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 97 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
98 'msvs_disabled_warnings': [ 4267, ], 98 'msvs_disabled_warnings': [ 4267, ],
99 }, 99 },
100 { 100 {
101 # GN version: //media/cdm/ppapi:clearkeycdmadapter_resources
101 'target_name': 'clearkeycdmadapter_resources', 102 'target_name': 'clearkeycdmadapter_resources',
102 'type': 'none', 103 'type': 'none',
103 'conditions': [ 104 'conditions': [
104 ['branding == "Chrome"', { 105 ['branding == "Chrome"', {
105 'variables': { 106 'variables': {
106 'branding_path': '../chrome/app/theme/google_chrome/BRANDING', 107 'branding_path': '../chrome/app/theme/google_chrome/BRANDING',
107 }, 108 },
108 }, { # else branding!="Chrome" 109 }, { # else branding!="Chrome"
109 'variables': { 110 'variables': {
110 'branding_path': '../chrome/app/theme/chromium/BRANDING', 111 'branding_path': '../chrome/app/theme/chromium/BRANDING',
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 # Built by clearkeycdm. 150 # Built by clearkeycdm.
150 '<(PRODUCT_DIR)/libclearkeycdm.so', 151 '<(PRODUCT_DIR)/libclearkeycdm.so',
151 ], 152 ],
152 }], 153 }],
153 ], 154 ],
154 }, 155 },
155 ], 156 ],
156 }], 157 }],
157 ], 158 ],
158 } 159 }
OLDNEW
« no previous file with comments | « media/cdm/ppapi/cdm_adapter.gni ('k') | media/media_cdm_adapter.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698