widevine-partner/ce_cdm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Source release v2.1.5-0-811 + third_party libs

Browse Source 
Change-Id: Ic8eafba071e486e671257bc22a8208e86d68b08a
This commit is contained in:
Joey Parrish
2014-07-07 16:22:33 -07:00
parent d7cd9243b0
commit fa64436e4f
13 changed files with 184 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

152
third_party/protobuf.gyp vendored
View File

@@ -1,8 +1,8 @@
# Copyright 2014 Google Inc. All Rights Reserved.
# Describes building protobuf and protoc from sources.
# Requires configuration of protobuf_source_dir and setting of
# use_system_protobuf to false.
# Requires configuration of protobuf_lib and setting of
# protobuf_lib_type to 'source'.
{
# Some sources are used by both libprotobuf_lite and libprotobuf.
@@ -13,21 +13,21 @@
# instead.
'variables': {
'protobuf_lite_sources': [
'<(protobuf_source_dir)/src/google/protobuf/extension_set.cc',
'<(protobuf_source_dir)/src/google/protobuf/generated_message_util.cc',
'<(protobuf_source_dir)/src/google/protobuf/message_lite.cc',
'<(protobuf_source_dir)/src/google/protobuf/repeated_field.cc',
'<(protobuf_source_dir)/src/google/protobuf/wire_format_lite.cc',
'<(protobuf_lib)/src/google/protobuf/extension_set.cc',
'<(protobuf_lib)/src/google/protobuf/generated_message_util.cc',
'<(protobuf_lib)/src/google/protobuf/message_lite.cc',
'<(protobuf_lib)/src/google/protobuf/repeated_field.cc',
'<(protobuf_lib)/src/google/protobuf/wire_format_lite.cc',
'<(protobuf_source_dir)/src/google/protobuf/io/coded_stream.cc',
'<(protobuf_source_dir)/src/google/protobuf/io/zero_copy_stream.cc',
'<(protobuf_source_dir)/src/google/protobuf/io/zero_copy_stream_impl_lite.cc',
'<(protobuf_lib)/src/google/protobuf/io/coded_stream.cc',
'<(protobuf_lib)/src/google/protobuf/io/zero_copy_stream.cc',
'<(protobuf_lib)/src/google/protobuf/io/zero_copy_stream_impl_lite.cc',
'<(protobuf_source_dir)/src/google/protobuf/stubs/atomicops_internals_x86_gcc.cc',
'<(protobuf_source_dir)/src/google/protobuf/stubs/atomicops_internals_x86_msvc.cc',
'<(protobuf_source_dir)/src/google/protobuf/stubs/common.cc',
'<(protobuf_source_dir)/src/google/protobuf/stubs/once.cc',
'<(protobuf_source_dir)/src/google/protobuf/stubs/stringprintf.cc',
'<(protobuf_lib)/src/google/protobuf/stubs/atomicops_internals_x86_gcc.cc',
'<(protobuf_lib)/src/google/protobuf/stubs/atomicops_internals_x86_msvc.cc',
'<(protobuf_lib)/src/google/protobuf/stubs/common.cc',
'<(protobuf_lib)/src/google/protobuf/stubs/once.cc',
'<(protobuf_lib)/src/google/protobuf/stubs/stringprintf.cc',
],
},
'targets': [
@@ -39,12 +39,12 @@
'<@(protobuf_lite_sources)',
],
'include_dirs': [
'<(protobuf_source_dir)',
'<(protobuf_source_dir)/src',
'<(protobuf_lib)',
'<(protobuf_lib)/src',
],
'direct_dependent_settings': {
'include_dirs': [
'<(protobuf_source_dir)/src',
'<(protobuf_lib)/src',
],
},
},
@@ -56,34 +56,34 @@
'sources': [
'<@(protobuf_lite_sources)',
'<(protobuf_source_dir)/src/google/protobuf/descriptor.cc',
'<(protobuf_source_dir)/src/google/protobuf/descriptor.pb.cc',
'<(protobuf_source_dir)/src/google/protobuf/descriptor_database.cc',
'<(protobuf_source_dir)/src/google/protobuf/dynamic_message.cc',
'<(protobuf_source_dir)/src/google/protobuf/extension_set_heavy.cc',
'<(protobuf_source_dir)/src/google/protobuf/generated_message_reflection.cc',
'<(protobuf_source_dir)/src/google/protobuf/message.cc',
'<(protobuf_source_dir)/src/google/protobuf/reflection_ops.cc',
'<(protobuf_source_dir)/src/google/protobuf/service.cc',
'<(protobuf_source_dir)/src/google/protobuf/text_format.cc',
'<(protobuf_source_dir)/src/google/protobuf/unknown_field_set.cc',
'<(protobuf_source_dir)/src/google/protobuf/wire_format.cc',
'<(protobuf_lib)/src/google/protobuf/descriptor.cc',
'<(protobuf_lib)/src/google/protobuf/descriptor.pb.cc',
'<(protobuf_lib)/src/google/protobuf/descriptor_database.cc',
'<(protobuf_lib)/src/google/protobuf/dynamic_message.cc',
'<(protobuf_lib)/src/google/protobuf/extension_set_heavy.cc',
'<(protobuf_lib)/src/google/protobuf/generated_message_reflection.cc',
'<(protobuf_lib)/src/google/protobuf/message.cc',
'<(protobuf_lib)/src/google/protobuf/reflection_ops.cc',
'<(protobuf_lib)/src/google/protobuf/service.cc',
'<(protobuf_lib)/src/google/protobuf/text_format.cc',
'<(protobuf_lib)/src/google/protobuf/unknown_field_set.cc',
'<(protobuf_lib)/src/google/protobuf/wire_format.cc',
'<(protobuf_source_dir)/src/google/protobuf/compiler/importer.cc',
'<(protobuf_source_dir)/src/google/protobuf/compiler/parser.cc',
'<(protobuf_lib)/src/google/protobuf/compiler/importer.cc',
'<(protobuf_lib)/src/google/protobuf/compiler/parser.cc',
'<(protobuf_source_dir)/src/google/protobuf/io/gzip_stream.cc',
'<(protobuf_source_dir)/src/google/protobuf/io/printer.cc',
'<(protobuf_source_dir)/src/google/protobuf/io/tokenizer.cc',
'<(protobuf_source_dir)/src/google/protobuf/io/zero_copy_stream_impl.cc',
'<(protobuf_lib)/src/google/protobuf/io/gzip_stream.cc',
'<(protobuf_lib)/src/google/protobuf/io/printer.cc',
'<(protobuf_lib)/src/google/protobuf/io/tokenizer.cc',
'<(protobuf_lib)/src/google/protobuf/io/zero_copy_stream_impl.cc',
'<(protobuf_source_dir)/src/google/protobuf/stubs/structurally_valid.cc',
'<(protobuf_source_dir)/src/google/protobuf/stubs/strutil.cc',
'<(protobuf_source_dir)/src/google/protobuf/stubs/substitute.cc',
'<(protobuf_lib)/src/google/protobuf/stubs/structurally_valid.cc',
'<(protobuf_lib)/src/google/protobuf/stubs/strutil.cc',
'<(protobuf_lib)/src/google/protobuf/stubs/substitute.cc',
],
'include_dirs': [
'<(protobuf_source_dir)',
'<(protobuf_source_dir)/src',
'<(protobuf_lib)',
'<(protobuf_lib)/src',
],
},
{
@@ -92,46 +92,46 @@
'toolsets': ['host'],
'includes': ['xcode_host.gypi'], # xcode workaround
'sources': [
'<(protobuf_source_dir)/src/google/protobuf/compiler/code_generator.cc',
'<(protobuf_source_dir)/src/google/protobuf/compiler/command_line_interface.cc',
'<(protobuf_source_dir)/src/google/protobuf/compiler/main.cc',
'<(protobuf_source_dir)/src/google/protobuf/compiler/plugin.cc',
'<(protobuf_source_dir)/src/google/protobuf/compiler/plugin.pb.cc',
'<(protobuf_source_dir)/src/google/protobuf/compiler/subprocess.cc',
'<(protobuf_source_dir)/src/google/protobuf/compiler/zip_writer.cc',
'<(protobuf_lib)/src/google/protobuf/compiler/code_generator.cc',
'<(protobuf_lib)/src/google/protobuf/compiler/command_line_interface.cc',
'<(protobuf_lib)/src/google/protobuf/compiler/main.cc',
'<(protobuf_lib)/src/google/protobuf/compiler/plugin.cc',
'<(protobuf_lib)/src/google/protobuf/compiler/plugin.pb.cc',
'<(protobuf_lib)/src/google/protobuf/compiler/subprocess.cc',
'<(protobuf_lib)/src/google/protobuf/compiler/zip_writer.cc',
'<(protobuf_source_dir)/src/google/protobuf/compiler/cpp/cpp_enum.cc',
'<(protobuf_source_dir)/src/google/protobuf/compiler/cpp/cpp_enum_field.cc',
'<(protobuf_source_dir)/src/google/protobuf/compiler/cpp/cpp_extension.cc',
'<(protobuf_source_dir)/src/google/protobuf/compiler/cpp/cpp_field.cc',
'<(protobuf_source_dir)/src/google/protobuf/compiler/cpp/cpp_file.cc',
'<(protobuf_source_dir)/src/google/protobuf/compiler/cpp/cpp_generator.cc',
'<(protobuf_source_dir)/src/google/protobuf/compiler/cpp/cpp_helpers.cc',
'<(protobuf_source_dir)/src/google/protobuf/compiler/cpp/cpp_message.cc',
'<(protobuf_source_dir)/src/google/protobuf/compiler/cpp/cpp_message_field.cc',
'<(protobuf_source_dir)/src/google/protobuf/compiler/cpp/cpp_primitive_field.cc',
'<(protobuf_source_dir)/src/google/protobuf/compiler/cpp/cpp_service.cc',
'<(protobuf_source_dir)/src/google/protobuf/compiler/cpp/cpp_string_field.cc',
'<(protobuf_lib)/src/google/protobuf/compiler/cpp/cpp_enum.cc',
'<(protobuf_lib)/src/google/protobuf/compiler/cpp/cpp_enum_field.cc',
'<(protobuf_lib)/src/google/protobuf/compiler/cpp/cpp_extension.cc',
'<(protobuf_lib)/src/google/protobuf/compiler/cpp/cpp_field.cc',
'<(protobuf_lib)/src/google/protobuf/compiler/cpp/cpp_file.cc',
'<(protobuf_lib)/src/google/protobuf/compiler/cpp/cpp_generator.cc',
'<(protobuf_lib)/src/google/protobuf/compiler/cpp/cpp_helpers.cc',
'<(protobuf_lib)/src/google/protobuf/compiler/cpp/cpp_message.cc',
'<(protobuf_lib)/src/google/protobuf/compiler/cpp/cpp_message_field.cc',
'<(protobuf_lib)/src/google/protobuf/compiler/cpp/cpp_primitive_field.cc',
'<(protobuf_lib)/src/google/protobuf/compiler/cpp/cpp_service.cc',
'<(protobuf_lib)/src/google/protobuf/compiler/cpp/cpp_string_field.cc',
'<(protobuf_source_dir)/src/google/protobuf/compiler/java/java_doc_comment.cc',
'<(protobuf_source_dir)/src/google/protobuf/compiler/java/java_enum.cc',
'<(protobuf_source_dir)/src/google/protobuf/compiler/java/java_enum_field.cc',
'<(protobuf_source_dir)/src/google/protobuf/compiler/java/java_extension.cc',
'<(protobuf_source_dir)/src/google/protobuf/compiler/java/java_field.cc',
'<(protobuf_source_dir)/src/google/protobuf/compiler/java/java_file.cc',
'<(protobuf_source_dir)/src/google/protobuf/compiler/java/java_generator.cc',
'<(protobuf_source_dir)/src/google/protobuf/compiler/java/java_helpers.cc',
'<(protobuf_source_dir)/src/google/protobuf/compiler/java/java_message.cc',
'<(protobuf_source_dir)/src/google/protobuf/compiler/java/java_message_field.cc',
'<(protobuf_source_dir)/src/google/protobuf/compiler/java/java_primitive_field.cc',
'<(protobuf_source_dir)/src/google/protobuf/compiler/java/java_service.cc',
'<(protobuf_source_dir)/src/google/protobuf/compiler/java/java_string_field.cc',
'<(protobuf_lib)/src/google/protobuf/compiler/java/java_doc_comment.cc',
'<(protobuf_lib)/src/google/protobuf/compiler/java/java_enum.cc',
'<(protobuf_lib)/src/google/protobuf/compiler/java/java_enum_field.cc',
'<(protobuf_lib)/src/google/protobuf/compiler/java/java_extension.cc',
'<(protobuf_lib)/src/google/protobuf/compiler/java/java_field.cc',
'<(protobuf_lib)/src/google/protobuf/compiler/java/java_file.cc',
'<(protobuf_lib)/src/google/protobuf/compiler/java/java_generator.cc',
'<(protobuf_lib)/src/google/protobuf/compiler/java/java_helpers.cc',
'<(protobuf_lib)/src/google/protobuf/compiler/java/java_message.cc',
'<(protobuf_lib)/src/google/protobuf/compiler/java/java_message_field.cc',
'<(protobuf_lib)/src/google/protobuf/compiler/java/java_primitive_field.cc',
'<(protobuf_lib)/src/google/protobuf/compiler/java/java_service.cc',
'<(protobuf_lib)/src/google/protobuf/compiler/java/java_string_field.cc',
'<(protobuf_source_dir)/src/google/protobuf/compiler/python/python_generator.cc',
'<(protobuf_lib)/src/google/protobuf/compiler/python/python_generator.cc',
],
'include_dirs': [
'<(protobuf_source_dir)',
'<(protobuf_source_dir)/src',
'<(protobuf_lib)',
'<(protobuf_lib)/src',
],
'dependencies': [
'protobuf',

41
third_party/protoc.gypi vendored
View File

@@ -1,25 +1,42 @@
# Copyright 2014 Google Inc. All rights reserved.
{
'variables': {
'cc_dir': '<(SHARED_INTERMEDIATE_DIR)/protoc_out/<(proto_out_dir)',
'cc_dir': '<(SHARED_INTERMEDIATE_DIR)/protoc_out',
'proto_in_dir%': '.',
},
'conditions': [
['use_system_protobuf=="false"', {
'variables': {
'protoc_dir': '<(PRODUCT_DIR)',
['protobuf_lib_type=="system"', {
# protobuf_lib is a library setting.
'direct_dependent_settings': {
'libraries': [
'<(protobuf_lib)',
],
},
}],
['protobuf_lib_type=="target"', {
# protobuf_lib is a gyp target.
'dependencies': [
'<(protobuf_gyp):protoc#host',
'<(protobuf_gyp):protobuf_lite',
'<(protobuf_lib)',
],
'export_dependent_settings': [
# Direct dependents of protobuf_lite have the correct protobuf include
# path, so export this as a dep to anyone who depends on the sources
# generated by this target.
'<(protobuf_gyp):protobuf_lite',
'<(protobuf_lib)',
],
}],
['protobuf_lib_type=="source"', {
# protobuf_lib is a source folder.
# We use protobuf.gyp to describe the build.
'dependencies': [
'../third_party/protobuf.gyp:protoc#host',
'../third_party/protobuf.gyp:protobuf_lite',
],
'export_dependent_settings': [
'../third_party/protobuf.gyp:protobuf_lite',
],
'variables': {
# Since we are building our own protoc, override protoc_dir.
'protoc_dir': '<(PRODUCT_DIR)',
},
}],
],
'rules': [
{
@@ -42,12 +59,10 @@
},
],
'include_dirs': [
'<(SHARED_INTERMEDIATE_DIR)/protoc_out',
'<(proto_out_dir)',
'<(cc_dir)',
],
'direct_dependent_settings': {
'include_dirs': [
'<(SHARED_INTERMEDIATE_DIR)/protoc_out',
'<(cc_dir)',
]
},