Source release 18.5.0
This commit is contained in:
19
third_party/boringssl/boringssl.gyp
vendored
19
third_party/boringssl/boringssl.gyp
vendored
@@ -155,35 +155,26 @@
|
||||
},
|
||||
],
|
||||
}],
|
||||
['OS=="mac"', {
|
||||
['OS in {"ios","mac"}', {
|
||||
'conditions': [
|
||||
['asm_target_arch=="x86"', {
|
||||
'sources': [
|
||||
'<@(boringssl_mac_x86_files)',
|
||||
'<@(boringssl_apple_x86_files)',
|
||||
],
|
||||
}],
|
||||
['asm_target_arch in {"x86-64", "x64"}', {
|
||||
'sources': [
|
||||
'<@(boringssl_mac_x86_64_files)',
|
||||
],
|
||||
}],
|
||||
],
|
||||
}],
|
||||
['OS=="ios"', {
|
||||
'conditions': [
|
||||
['asm_target_arch in {"x86-64", "x64"}', {
|
||||
'sources': [
|
||||
'<@(boringssl_mac_x86_64_files)',
|
||||
'<@(boringssl_apple_x86_64_files)',
|
||||
],
|
||||
}],
|
||||
['asm_target_arch=="arm"', {
|
||||
'sources': [
|
||||
'<@(boringssl_ios_arm_files)',
|
||||
'<@(boringssl_apple_arm_files)',
|
||||
],
|
||||
}],
|
||||
['asm_target_arch=="arm64"', {
|
||||
'sources': [
|
||||
'<@(boringssl_ios_aarch64_files)',
|
||||
'<@(boringssl_apple_aarch64_files)',
|
||||
],
|
||||
}],
|
||||
],
|
||||
|
||||
43
third_party/generate_proto_cc.gyp
vendored
Normal file
43
third_party/generate_proto_cc.gyp
vendored
Normal file
@@ -0,0 +1,43 @@
|
||||
{
|
||||
'includes': [
|
||||
'../cdm/platform_properties.gypi',
|
||||
],
|
||||
'targets': [
|
||||
{
|
||||
'toolsets' : [ 'target' ],
|
||||
'target_name': 'generate_license_protocol',
|
||||
'type': 'none',
|
||||
'standalone_static_library': 0,
|
||||
'hard_dependency': 1,
|
||||
'includes': [ 'protoc.gypi' ],
|
||||
'sources': [ '<(DEPTH)/core/src/license_protocol.proto' ],
|
||||
'variables': {
|
||||
'proto_in_dir': '<(DEPTH)/core/src',
|
||||
},
|
||||
},
|
||||
{
|
||||
'toolsets' : [ 'target' ],
|
||||
'target_name': 'generate_device_files',
|
||||
'type': 'none',
|
||||
'standalone_static_library': 0,
|
||||
'hard_dependency': 1,
|
||||
'includes': [ 'protoc.gypi' ],
|
||||
'sources': [ '<(DEPTH)/core/src/device_files.proto' ],
|
||||
'variables': {
|
||||
'proto_in_dir': '<(DEPTH)/core/src',
|
||||
},
|
||||
},
|
||||
{
|
||||
'toolsets' : [ 'target' ],
|
||||
'target_name': 'generate_metrics_proto',
|
||||
'type': 'none',
|
||||
'standalone_static_library': 0,
|
||||
'hard_dependency': 1,
|
||||
'includes': [ 'protoc.gypi' ],
|
||||
'sources': [ '<(DEPTH)/metrics/src/wv_metrics.proto' ],
|
||||
'variables': {
|
||||
'proto_in_dir': '<(DEPTH)/metrics/src',
|
||||
},
|
||||
},
|
||||
]
|
||||
}
|
||||
2
third_party/protobuf.gyp
vendored
2
third_party/protobuf.gyp
vendored
@@ -278,6 +278,8 @@
|
||||
],
|
||||
'xcode_settings': {
|
||||
'OTHER_CFLAGS': ['-w'],
|
||||
'PRODUCT_BUNDLE_IDENTIFIER': 'com.google.protoc',
|
||||
'PROVISIONING_PROFILE_SPECIFIER': '',
|
||||
'USE_HEADERMAP': 'NO',
|
||||
},
|
||||
'msvs_settings': {
|
||||
|
||||
Reference in New Issue
Block a user