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

Side by Side Diff: chrome/chrome_common.gypi

Issue 881213004: Support building BoringSSL with NSS certificates. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: slightly tidier (edit: looks like this'll need a rebase later for try jobs to run.) Created 5 years, 9 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) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 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 # File lists shared with GN build. 7 # File lists shared with GN build.
8 'chrome_common_sources': [ 8 'chrome_common_sources': [
9 'common/all_messages.h', 9 'common/all_messages.h',
10 'common/attrition_experiments.h', 10 'common/attrition_experiments.h',
(...skipping 593 matching lines...) Expand 10 before | Expand all | Expand 10 after
604 '<(DEPTH)/ui/base/ui_base.gyp:ui_base', 604 '<(DEPTH)/ui/base/ui_base.gyp:ui_base',
605 ], 605 ],
606 'conditions': [ 606 'conditions': [
607 ['OS != "ios"', { 607 ['OS != "ios"', {
608 'dependencies': [ 608 'dependencies': [
609 '<(DEPTH)/gpu/gpu.gyp:gpu_ipc', 609 '<(DEPTH)/gpu/gpu.gyp:gpu_ipc',
610 ], 610 ],
611 }, { # OS == ios 611 }, { # OS == ios
612 'sources!': [ 612 'sources!': [
613 'common/net/net_resource_provider.cc', 613 'common/net/net_resource_provider.cc',
614 ],
615 }],
616 ['OS == "android" or OS == "ios"', {
617 'sources!': [
614 'common/net/x509_certificate_model.cc', 618 'common/net/x509_certificate_model.cc',
615 ], 619 ],
616 }], 620 }],
617 ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', { 621 ['use_openssl_certs == 1 and OS != "android"', {
618 'dependencies': [
619 '../build/linux/system.gyp:ssl',
620 ],
621 },
622 ],
623 ['os_posix != 1 or OS == "mac" or OS == "ios"', {
624 'sources!': [
625 'common/net/x509_certificate_model_nss.cc',
626 'common/net/x509_certificate_model_openssl.cc',
627 ],
628 },
629 ],
630 ['OS == "android"', {
631 'dependencies': [
632 '../third_party/boringssl/boringssl.gyp:boringssl',
633 ],
634 'sources!': [
635 'common/net/x509_certificate_model.cc',
636 'common/net/x509_certificate_model_openssl.cc',
637 ],
638 }],
639 ['use_openssl==1', {
640 'sources!': [
641 'common/net/x509_certificate_model_nss.cc',
642 ],
643 'dependencies': [ 622 'dependencies': [
644 '<(DEPTH)/third_party/boringssl/boringssl.gyp:boringssl', 623 '<(DEPTH)/third_party/boringssl/boringssl.gyp:boringssl',
645 ], 624 ],
646 }, 625 }, {
647 { # else !use_openssl: remove the unneeded files
648 'sources!': [ 626 'sources!': [
649 'common/net/x509_certificate_model_openssl.cc', 627 'common/net/x509_certificate_model_openssl.cc',
650 ], 628 ],
651 }, 629 },
652 ], 630 ],
631 ['use_nss == 1', {
632 'dependencies': [
633 '../build/linux/system.gyp:ssl',
634 ],
635 }, {
636 'sources!': [
637 'common/net/x509_certificate_model_nss.cc',
638 ],
639 },
640 ],
653 ['OS=="win"', { 641 ['OS=="win"', {
654 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 642 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
655 'msvs_disabled_warnings': [4267, ], 643 'msvs_disabled_warnings': [4267, ],
656 }, 644 },
657 ], 645 ],
658 ], 646 ],
659 }, 647 },
660 { 648 {
661 # Protobuf compiler / generator for the safebrowsing client 649 # Protobuf compiler / generator for the safebrowsing client
662 # model proto and the client-side detection (csd) request 650 # model proto and the client-side detection (csd) request
663 # protocol buffer. 651 # protocol buffer.
664 652
665 # GN version: //chrome/common/safe_browsing:proto 653 # GN version: //chrome/common/safe_browsing:proto
666 'target_name': 'safe_browsing_proto', 654 'target_name': 'safe_browsing_proto',
667 'type': 'static_library', 655 'type': 'static_library',
668 'sources': [ 656 'sources': [
669 'common/safe_browsing/client_model.proto', 657 'common/safe_browsing/client_model.proto',
670 'common/safe_browsing/crx_info.proto', 658 'common/safe_browsing/crx_info.proto',
671 'common/safe_browsing/csd.proto' 659 'common/safe_browsing/csd.proto'
672 ], 660 ],
673 'variables': { 661 'variables': {
674 'proto_in_dir': 'common/safe_browsing', 662 'proto_in_dir': 'common/safe_browsing',
675 'proto_out_dir': 'chrome/common/safe_browsing', 663 'proto_out_dir': 'chrome/common/safe_browsing',
676 }, 664 },
677 'includes': [ '../build/protoc.gypi' ], 665 'includes': [ '../build/protoc.gypi' ],
678 }, 666 },
679 ], 667 ],
680 } 668 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698