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

Side by Side Diff: chrome/chrome_installer.gypi

Issue 1957643002: media: Move widevine CDM targets to WidevineCdm folder (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more fix Created 4 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 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 'lastchange_path': '../build/util/LASTCHANGE', 7 'lastchange_path': '../build/util/LASTCHANGE',
8 'branding_dir': 'app/theme/<(branding_path_component)', 8 'branding_dir': 'app/theme/<(branding_path_component)',
9 'branding_dir_100': 'app/theme/default_100_percent/<(branding_path_component )', 9 'branding_dir_100': 'app/theme/default_100_percent/<(branding_path_component )',
10 }, 10 },
(...skipping 501 matching lines...) Expand 10 before | Expand all | Expand 10 after
512 '-d', '<(branding_path_component)'], 512 '-d', '<(branding_path_component)'],
513 'rpm_cmd': ['<@(flock_bash)', '<(rpm_build)', '-o' '<(PRODUCT_DIR)', 513 'rpm_cmd': ['<@(flock_bash)', '<(rpm_build)', '-o' '<(PRODUCT_DIR)',
514 '-b', '<(PRODUCT_DIR)', '-a', '<(target_arch)', 514 '-b', '<(PRODUCT_DIR)', '-a', '<(target_arch)',
515 '-d', '<(branding_path_component)'], 515 '-d', '<(branding_path_component)'],
516 'conditions': [ 516 'conditions': [
517 ['target_arch=="ia32"', { 517 ['target_arch=="ia32"', {
518 'deb_arch': 'i386', 518 'deb_arch': 'i386',
519 'rpm_arch': 'i386', 519 'rpm_arch': 'i386',
520 'packaging_files_binaries': [ 520 'packaging_files_binaries': [
521 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', 521 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
522 '<(PRODUCT_DIR)/libwidevinecdmadapter.so', 522 '<(PRODUCT_DIR)/WidevineCdm/libwidevinecdmadapter.so',
523 '<(PRODUCT_DIR)/libwidevinecdm.so', 523 '<(PRODUCT_DIR)/WidevineCdm/libwidevinecdm.so',
524 ], 524 ],
525 'packaging_files_common': [ 525 'packaging_files_common': [
526 '<(DEPTH)/build/linux/bin/eu-strip', 526 '<(DEPTH)/build/linux/bin/eu-strip',
527 ], 527 ],
528 }], 528 }],
529 ['target_arch=="x64"', { 529 ['target_arch=="x64"', {
530 'deb_arch': 'amd64', 530 'deb_arch': 'amd64',
531 'rpm_arch': 'x86_64', 531 'rpm_arch': 'x86_64',
532 'packaging_files_binaries': [ 532 'packaging_files_binaries': [
533 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', 533 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe',
534 '<(PRODUCT_DIR)/libwidevinecdmadapter.so', 534 '<(PRODUCT_DIR)/WidevineCdm/libwidevinecdmadapter.so',
535 '<(PRODUCT_DIR)/libwidevinecdm.so', 535 '<(PRODUCT_DIR)/WidevineCdm/libwidevinecdm.so',
536 ], 536 ],
537 'packaging_files_common': [ 537 'packaging_files_common': [
538 '<!(which eu-strip)', 538 '<!(which eu-strip)',
539 ], 539 ],
540 }], 540 }],
541 ['target_arch=="arm"', { 541 ['target_arch=="arm"', {
542 'deb_arch': 'arm', 542 'deb_arch': 'arm',
543 'rpm_arch': 'arm', 543 'rpm_arch': 'arm',
544 }], 544 }],
545 ['asan==1', { 545 ['asan==1', {
(...skipping 621 matching lines...) Expand 10 before | Expand all | Expand 10 after
1167 '../build/isolate.gypi', 1167 '../build/isolate.gypi',
1168 ], 1168 ],
1169 'sources': [ 1169 'sources': [
1170 'setup_unittests.isolate', 1170 'setup_unittests.isolate',
1171 ], 1171 ],
1172 }, 1172 },
1173 ], 1173 ],
1174 }], 1174 }],
1175 ], 1175 ],
1176 } 1176 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698